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

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit 23852b3d10) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>
fix: vela addnon enable cannot support = (#3158 )
2026-03-02 01:30:47 +00:00 · 2022-01-25 15:05:46 +08:00 · 2022-01-25 13:58:24 +08:00 · 2022-01-25 13:28:01 +08:00 · 2022-01-25 10:47:07 +08:00 · 2022-01-24 13:56:59 +08:00
449 changed files with 4292 additions and 31301 deletions
--- a/.github/workflows/apiserver-test.yaml
+++ b/.github/workflows/apiserver-test.yaml
@@ -15,7 +15,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -84,8 +84,9 @@ jobs:
      - name: Cleanup for e2e tests
        run: |
          make e2e-cleanup
-          make vela-cli
          make e2e-setup-core
+
+          make vela-cli
          bin/vela addon enable fluxcd
          timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -5,30 +5,6 @@ on:
    branches: [ master, release-* ]

 jobs:
-  images:
-    name: Image Scan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Build Vela Core image from Dockerfile
-        run: |
-          docker build --build-arg GOPROXY=https://proxy.golang.org -t docker.io/oamdev/vela-core:${{ github.sha }} .
-
-      - name: Run Trivy vulnerability scanner for vela core
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/oamdev/vela-core:${{ github.sha }}'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
-        if: always()
-        with:
-          sarif_file: 'trivy-results.sarif'
-
  analyze:
    name: Analyze
    runs-on: ubuntu-latest
--- a/.github/workflows/e2e-multicluster-test.yml
+++ b/.github/workflows/e2e-multicluster-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -76,13 +76,17 @@ 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 vela-cli
          make e2e-setup-core
          make
          make setup-runtime-e2e-cluster
+          make vela-cli

      - name: Run e2e multicluster tests
        run: |
--- a/.github/workflows/e2e-rollout-test.yml
+++ b/.github/workflows/e2e-rollout-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

@@ -108,11 +108,6 @@ jobs:
        with:
          go-version: ${{ env.GO_VERSION }}

-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
      - name: Cache Go Dependencies
        uses: actions/cache@v2
        with:
--- a/.github/workflows/registry.yml
+++ b/.github/workflows/registry.yml
@@ -142,13 +142,6 @@ jobs:
        uses: azure/setup-helm@v1
        with:
          version: v3.4.0
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - name: Generate helm doc
-        run: |
-          make helm-doc-gen
      - name: Prepare legacy chart
        run: |
          rsync -r $LEGACY_HELM_CHART $HELM_CHARTS_DIR
@@ -194,9 +187,10 @@ jobs:
        run: ./ossutil --config-file .ossutilconfig sync oss://$BUCKET/core $LOCAL_OSS_DIRECTORY
      - name: add artifacthub stuff to the repo
        run: |
-          rsync $HELM_CHART/README.md $LEGACY_HELM_CHART/README.md
-          rsync $HELM_CHART/README.md $OAM_RUNTIME_HELM_CHART/README.md
-          rsync $HELM_CHART/README.md $VELA_ROLLOUT_HELM_CHART/README.md
+          rsync README.md $HELM_CHART/README.md
+          rsync README.md $LEGACY_HELM_CHART/README.md
+          rsync README.md $OAM_RUNTIME_HELM_CHART/README.md
+          rsync README.md $VELA_ROLLOUT_HELM_CHART/README.md
          sed -i "s/ARTIFACT_HUB_REPOSITORY_ID/$ARTIFACT_HUB_REPOSITORY_ID/g" hack/artifacthub/artifacthub-repo.yml
          rsync hack/artifacthub/artifacthub-repo.yml $LOCAL_OSS_DIRECTORY
      - name: Package helm charts
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.16
      - name: Get release
        id: get_release
        uses: bruceadams/get-release@v1.2.2
--- a/.github/workflows/sync-api.yml
+++ b/.github/workflows/sync-api.yml
@@ -11,10 +11,10 @@ jobs:
  sync-core-api:
    runs-on: ubuntu-20.04
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.16
        uses: actions/setup-go@v1
        env:
-          GO_VERSION: '1.17'
+          GO_VERSION: '1.16'
          GOLANGCI_VERSION: 'v1.38'
        with:
          go-version: ${{ env.GO_VERSION }}
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -13,7 +13,7 @@ on:

 env:
  # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.16'
  GOLANGCI_VERSION: 'v1.38'
  KIND_VERSION: 'v0.7.0'

--- a/.krew.yaml
+++ b/.krew.yaml
@@ -33,8 +33,8 @@ spec:
        arch: amd64
    {{addURIAndSha "https://github.com/oam-dev/kubevela/releases/download/{{ .TagName }}/kubectl-vela-{{ .TagName }}-windows-amd64.zip" .TagName }}
    files:
-    - from: "*/kubectl-vela"
-      to: "kubectl-vela.exe"
+    - from: "*/kubectl-vela.exe"
+      to: "."
    - from: "*/LICENSE"
      to: "."
    bin: "kubectl-vela.exe"
--- a/CHANGELOG/CHANGELOG-1.2.md
+++ b/CHANGELOG/CHANGELOG-1.2.md
@@ -1,205 +1,5 @@
-# v1.2.2
+# v1.2.0-alpha1

+## What's changed

-## What's Changed
-* Feat: add JFrog webhook trigger by @chwetion in https://github.com/oam-dev/kubevela/pull/3104
-* Fix: trait/comp command output without a new line by @chivalryq in https://github.com/oam-dev/kubevela/pull/3112
-* Feat: support wild match for env patch by @Somefive in https://github.com/oam-dev/kubevela/pull/3111
-* Fix: fix revision will change when add new trait with skiprevisionaffect to application by @chwetion in https://github.com/oam-dev/kubevela/pull/3032
-* Fix: add app samples for Terraform definition by @zzxwill in https://github.com/oam-dev/kubevela/pull/3118
-* Feat: add port name in webservice by @FogDong in https://github.com/oam-dev/kubevela/pull/3110
-* Fix: add imagePullSecrets for helm templates  to support private docker registry by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3122
-* Fix: workflow skip executing all steps occasionally by @leejanee in https://github.com/oam-dev/kubevela/pull/3025
-* Fix: support generate Terraform ComponentDefinition from local HCL file by @zzxwill in https://github.com/oam-dev/kubevela/pull/3132
-* Fix: prioritize namespace flag for `vela up` by @devholic in https://github.com/oam-dev/kubevela/pull/3135
-* Fix: handle workflow cache reconcile by @FogDong in https://github.com/oam-dev/kubevela/pull/3128
-* Feat: extend gateway trait to set class in spec by @devholic in https://github.com/oam-dev/kubevela/pull/3138
-* Fix: add providerRef in generated ComponentDefinition by @zzxwill in https://github.com/oam-dev/kubevela/pull/3142
-* Fix: retrieve Terraform variables from variables.tf by @zzxwill in https://github.com/oam-dev/kubevela/pull/3149
-* Feat: addon parameter support ui-shcema by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3154
-* Fix: vela addnon enable cannot support '=' by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3156
-* Fix: add context parameters into the error message by @zeed-w-beez in https://github.com/oam-dev/kubevela/pull/3145
-* Feat: support vela show for workflow step definition by @FogDong in https://github.com/oam-dev/kubevela/pull/3140
-
-## New Contributors
-* @devholic made their first contribution in https://github.com/oam-dev/kubevela/pull/3135
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.2.1...v1.2.2
-
-# v1.2.1
-
-## What's Changed
-
-* Fix: can't query data from the MongoDB by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3095
-* Fix: use personel token of vela-bot instead of github token for homebrew update by @wonderflow in https://github.com/oam-dev/kubevela/pull/3096
-* Fix: acr image no version by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/3100
-* Fix: support generate cloud resource docs in Chinese by @zzxwill in https://github.com/oam-dev/kubevela/pull/3079
-* Fix: clear old data in mongodb unit test case by @barnettZQG in https://github.com/oam-dev/kubevela/pull/3103
-* Feat: support external revision in patch component by @Somefive in https://github.com/oam-dev/kubevela/pull/3106
-* Fix:  file under the path of github addon registry is not ignored by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3099
-* Fix: Vela is crashed, when disabling addon, which needs namespace vela-system by @StevenLeiZhang in https://github.com/oam-dev/kubevela/pull/3109
-* Fix: rollout workload namespace not aligned with rollout by @Somefive in https://github.com/oam-dev/kubevela/pull/3107
-
-## New Contributors
-* @StevenLeiZhang made their first contribution in https://github.com/oam-dev/kubevela/pull/3099
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.2.0...v1.2.1
-
-
-# v1.2.0
-
-❤️  KubeVela v1.2.0 released ! ❤️
-
-Docs have been updated about the release at https://kubevela.io/docs/next/ .
-
-**Changelog Between v1.2.0-rc.2~v1.2.0**: https://github.com/oam-dev/kubevela/compare/v1.2.0-rc.2...v1.2.0
-
-## What's New
-
-### UI Console Supported
-
-Check how to use the GUI by this [how-to document](https://kubevela.io/docs/next/how-to/dashboard/application/create-application).
-
-**GUI frontend code repo is here: https://github.com/oam-dev/velaux**
-**API Server Code is here: https://github.com/oam-dev/kubevela/tree/master/pkg/apiserver**
-
-We also add a [VelaQL](https://kubevela.io/docs/next/platform-engineers/system-operation/velaql) feature that could allow apiserver to interact with K8s Object in an extended way.
-
-### Addon System
-
-We add a new addon system in v1.2, this helps KubeVela install it's extension including more than X-Definition files.
-
-The community has already supported some built-in addons here（https://github.com/oam-dev/catalog/tree/master/addons ）, there're also some experimental addons here （https://github.com/oam-dev/catalog/tree/master/experimental/addons）。
-
-You can learn how to use it [from docs](https://kubevela.io/docs/next/how-to/cli/addon/addon).
-
-You can [build and contribute](https://kubevela.io/docs/next/platform-engineers/addon/intro) your own addons.
-
-### CI/CD Integration
-
-You can use triggers to integrate with different CI and image registry systems on VelaUX.
-
-* Feat: add ACR webhook trigger for CI/CD (#3044)
-* Feat: add Harbor image registry webhook trigger for CI/CD (#3065)
-* Feat: add DockerHub webhook trigger for CI/CD (#3081)
-
-### Cloud Resources Enhancement
-
-* Feature: support terraform/provider-azure addon by @zzxwill in https://github.com/oam-dev/kubevela/pull/2402
-* Fix: aws/azure Terraform provider are broken by @zzxwill in https://github.com/oam-dev/kubevela/pull/2513 ,  https://github.com/oam-dev/kubevela/pull/2520 , https://github.com/oam-dev/kubevela/pull/2465
-* Feat: Add Terraform Azure Storage Account by @maciejgwizdala in https://github.com/oam-dev/kubevela/pull/2646
-* Docs: add vpc and vswitch cloud resource templates of alicloud by @lowkeyrd in https://github.com/oam-dev/kubevela/pull/2663
-* Fix: allow external cloud resources to be kept when Application is deleted by @zzxwill in https://github.com/oam-dev/kubevela/pull/2698
-* Feat: add alibaba cloud redis definition by @chivalryq in https://github.com/oam-dev/kubevela/pull/2507
-* Feat: envbinding support cloud resource deploy and share by @Somefive in https://github.com/oam-dev/kubevela/pull/2734
-* Fix: support naming a terraform provider by @zzxwill in https://github.com/oam-dev/kubevela/pull/2794
-
-
-### Multi-Cluster Enhancement
-
-* Feat: multicluster support ServiceAccountToken by @Somefive in https://github.com/oam-dev/kubevela/pull/2356
-* Feat: add secure tls for cluster-gateway by @Somefive in https://github.com/oam-dev/kubevela/pull/2426
-* Feat: add support for envbinding with namespace selector by @Somefive in https://github.com/oam-dev/kubevela/pull/2432
-* Feat: upgrade cluster gateway to support remote debug by @Somefive in https://github.com/oam-dev/kubevela/pull/2673
-* Feat: set multicluster enabled by default  by @Somefive in #2930
-
-### Workflow Enhancement
-
-* Feat: add apply raw built in workflow steps by @FogDong in https://github.com/oam-dev/kubevela/pull/2420
-* Feat: add read object step def by @FogDong in https://github.com/oam-dev/kubevela/pull/2480
-* Feat: add export config and secret def for workflow by @FogDong in https://github.com/oam-dev/kubevela/pull/2484
-* Feat: support secret in webhook notification by @FogDong in https://github.com/oam-dev/kubevela/pull/2509
-* Feat: Record workflow execution state by @leejanee in https://github.com/oam-dev/kubevela/pull/2479
-* Fix(cli): use flag instead of env in workflow cli by @FogDong in https://github.com/oam-dev/kubevela/pull/2512
-* Not update resource if render hash equal. by @leejanee in https://github.com/oam-dev/kubevela/pull/2522
-* Feat: add email support in webhook notification by @FogDong in https://github.com/oam-dev/kubevela/pull/2535
-* Feat: add render component and apply component remaining by @FogDong in https://github.com/oam-dev/kubevela/pull/2587
-* Feat: add list application records api by @FogDong in https://github.com/oam-dev/kubevela/pull/2757
-* Feat: component-pod-view support filter resource by cluster name and cluster namespace by @yangsoon in https://github.com/oam-dev/kubevela/pull/2754
-* Feat: workflow support update by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2760
-* Feat: add workflow reconciling backoff time and failed limit times by @FogDong in #2881
-
-### Component/Trait Enhancement
-
-* Feat: add health check and custom status for helm type component  by @chivalryq in https://github.com/oam-dev/kubevela/pull/2499
-* Feat: add nocalhost dev config trait definition by @yuyicai in https://github.com/oam-dev/kubevela/pull/2545
-* Feat(rollout): fill rolloutBatches if empty when scale up/down by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2569
-* Feat: allow import package in custom status cue template by @Chwetion in https://github.com/oam-dev/kubevela/pull/2585
-* Feat: add trait service-account by @yangsoon in https://github.com/oam-dev/kubevela/pull/2878
-* Fix: add ingress class as arguments by @Somefive in https://github.com/oam-dev/kubevela/pull/2445
-* Fix: add libgit2 support for gitops by @FogDong in https://github.com/oam-dev/kubevela/pull/2477
-* Fix: make nginx class to be default value and allow pvc trait to attach more than once by @wonderflow in https://github.com/oam-dev/kubevela/pull/2466
-* Feat: add imagePullPolicy/imagePullSecret to task def by @chivalryq in https://github.com/oam-dev/kubevela/pull/2503
-
-
-### Vela CLI Enhancement
-
-* Feat: add vela prob to test cluster by @wonderflow in https://github.com/oam-dev/kubevela/pull/2635
-* Feat: vela logs support multicluster by @chivalryq in https://github.com/oam-dev/kubevela/pull/2593
-* Feat: vela-cli support use ocm to join/list/detach cluster by @yangsoon in https://github.com/oam-dev/kubevela/pull/2599
-* Feat: add vela exec for multi cluster by @wonderflow in https://github.com/oam-dev/kubevela/pull/2299
-* Feat: multicluster vela status/exec/port-forward by @Somefive in https://github.com/oam-dev/kubevela/pull/2662
-* Fix: support `-n` flag for all commands to specify namespace by @chivalryq in https://github.com/oam-dev/kubevela/pull/2719
-* Feat: vela delete add wait and force options by @yangsoon in https://github.com/oam-dev/kubevela/pull/2747
-* Feat: add workflow rollback cli by @FogDong in https://github.com/oam-dev/kubevela/pull/2795
-* Refactor: refine cli commands && align kubectl-vela with vela && use getnamespaceAndEnv for all by @wonderflow in #3048
-
-
-### Overall Enhancements
-
-* Feat: ResourceTracker new architecture by @Somefive in https://github.com/oam-dev/kubevela/pull/2849
-* New Resource Management Model: Garbage Collection and Resource State Keeper [Desigin Doc](https://github.com/oam-dev/kubevela/blob/master/design/vela-core/resourcetracker_design.md)
-* Feat:  output log with structured tag & add step duration metrics by @leejanee in https://github.com/oam-dev/kubevela/pull/2683
-* Feat: support user defined image registry that allows private installation by @wonderflow in https://github.com/oam-dev/kubevela/pull/2623
-* Feat: add a built in garbage-collect policy to application by @yangsoon in https://github.com/oam-dev/kubevela/pull/2575
-* Feat: health scope controller support check trait-managing workload by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2527
-* Chore:  add homebrew bump to support `brew install kubevela` by @basefas in https://github.com/oam-dev/kubevela/pull/2434
-* Chore: Update release action to support build binaries for more platform by @basefas in https://github.com/oam-dev/kubevela/pull/2537
-* Feat: add reconcile timeout configuration for vela-core by @Somefive in https://github.com/oam-dev/kubevela/pull/2630
-* Chore: push docker images to Alibaba Cloud ACR by @zzxwill in https://github.com/oam-dev/kubevela/pull/2601
-
-
-## What's Changed/Deprecated
-
-* Deprecated: containerized workload by @reetasingh in https://github.com/oam-dev/kubevela/pull/2330
-* Deprecated: initializer CRD controller by @chivalryq in https://github.com/oam-dev/kubevela/pull/2491
-* Deprecated: remove envbinding controller, use #ApplyComponent for EnvBinding by @Somefive in https://github.com/oam-dev/kubevela/pull/2556 , https://github.com/oam-dev/kubevela/pull/2382
-* Deprecated(cli): CLI vela config by @chivalryq in https://github.com/oam-dev/kubevela/pull/2037
-* Deprecated: remove addon with no definitions by @chivalryq in https://github.com/oam-dev/kubevela/pull/2574
-* Refactor: remove apiserver component from the chart, users should use velaux addon instead by @barnettZQG in https://github.com/oam-dev/kubevela/pull/2838
-* Refactor: all addons are migrated from initializer to application objects by @chivalryq in https://github.com/oam-dev/kubevela/pull/2444
-* Refactor: change rollout's json tag so the status of rollout will be optional by @GingoBang in https://github.com/oam-dev/kubevela/pull/2314
-* Deprecated: deprecate CRD discovery for CUE import in Definition to prevent memory leak and OOM crash (#2925)
-* Deprecated: delete approllout related code #3040
-* Deprecate: delete appDeployment related logic #3050
-
-## Bugfix
-
-* Feat: rework resource tracker to solve bugs by @Somefive in https://github.com/oam-dev/kubevela/pull/2797
-* Fix: change raw extension to pointer by @FogDong in https://github.com/oam-dev/kubevela/pull/2451
-* Fix: show reconcile error log by @wonderflow in https://github.com/oam-dev/kubevela/pull/2626
-* Fix: Closure Bug In newValue by @leejanee in https://github.com/oam-dev/kubevela/pull/2437
-* Fix: resourceTracker compatibility bug by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2467
-* Fix(application): nil pointer for component properties by @kinsolee in https://github.com/oam-dev/kubevela/pull/2481
-* Fix: Commit step-generate data  without success by @leejanee in https://github.com/oam-dev/kubevela/pull/2539
-* Fix(cli): client-side throttling in vela CLI by @chivalryq in https://github.com/oam-dev/kubevela/pull/2581
-* Fix: fix delete a component from application not delete workload by @wangyikewxgm in https://github.com/oam-dev/kubevela/pull/2680
-* Fix: lookupByScript don't support `import` by @leejanee in https://github.com/oam-dev/kubevela/pull/2788
-* Fix: resourcetracker do not garbage collect legacyRTs correctly by @Somefive in https://github.com/oam-dev/kubevela/pull/2817
-* Fix: application conditions confusion. by @leejanee in https://github.com/oam-dev/kubevela/pull/2834
-
-## New Contributors
-* @GingoBang made their first contribution in https://github.com/oam-dev/kubevela/pull/2314
-* @basefas made their first contribution in https://github.com/oam-dev/kubevela/pull/2434
-* @yuyicai made their first contribution in https://github.com/oam-dev/kubevela/pull/2540
-* @maciejgwizdala made their first contribution in https://github.com/oam-dev/kubevela/pull/2646
-* @lowkeyrd made their first contribution in https://github.com/oam-dev/kubevela/pull/2663
-* @zxbyoyoyo made their first contribution in https://github.com/oam-dev/kubevela/pull/2703
-* @yue9944882 made their first contribution in https://github.com/oam-dev/kubevela/pull/2751
-* @snyk-bot made their first contribution in https://github.com/oam-dev/kubevela/pull/2857
-* @yunjianzhong made their first contribution in https://github.com/oam-dev/kubevela/pull/3005
-* @songminglong made their first contribution in https://github.com/oam-dev/kubevela/pull/3064
-* @basuotian made their first contribution in https://github.com/oam-dev/kubevela/pull/3059
-* @K1ngram4 made their first contribution in https://github.com/oam-dev/kubevela/pull/3065
-
-**Full Changelog**: https://github.com/oam-dev/kubevela/compare/v1.1.3...v1.2.0
+1. Feature: support terraform/provider-azure addon #2402 by @zzxwill 
--- a/9
+++ b/9
@@ -1,6 +1,6 @@
-ARG BASE_IMAGE
+ARG BASE_IMAGE="alpine:latest"
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -21,7 +21,6 @@ COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
-COPY references/ references/

 # Build
 ARG TARGETARCH
@@ -35,9 +34,9 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-FROM ${BASE_IMAGE:-alpine:3.15}
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

--- a/Dockerfile.apiserver
+++ b/Dockerfile.apiserver
@@ -1,6 +1,6 @@
-ARG BASE_IMAGE
+ARG BASE_IMAGE="alpine:latest"
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace
@@ -17,7 +17,6 @@ COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
-COPY references/ references/

 # Build
 ARG TARGETARCH
@@ -33,9 +32,9 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`

-FROM ${BASE_IMAGE:-alpine:3.15}
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,6 +1,5 @@
-ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16-alpine as builder

 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -18,7 +17,6 @@ COPY cmd/ cmd/
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
-COPY references/ references/

 # Build
 ARG TARGETARCH
@@ -26,8 +24,8 @@ ARG VERSION
 ARG GITVERSION

 RUN  apk add gcc musl-dev libc-dev ;\
-    GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
-    go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .
+     GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+     go test -c -o manager-${TARGETARCH}  -cover -covermode=atomic -coverpkg ./... .

 RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
    go build -a -ldflags "-s -w -X github.com/oam-dev/kubevela/version.VelaVersion=${VERSION:-undefined} -X github.com/oam-dev/kubevela/version.GitRevision=${GITVERSION:-undefined}" \
@@ -37,10 +35,10 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
 # You can replace distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 # Overwrite `BASE_IMAGE` by passing `--build-arg=BASE_IMAGE=gcr.io/distroless/static:nonroot`
-
-FROM ${BASE_IMAGE:-alpine:3.15}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-alpine:latest}
 # This is required by daemon connnecting with cri
-RUN apk add --no-cache ca-certificates bash expat
+RUN apk add --no-cache ca-certificates bash

 WORKDIR /

--- a/14
+++ b/14
@@ -9,12 +9,9 @@ include makefiles/e2e.mk
 all: build

 # Run tests
-test: vet lint staticcheck unit-test-core test-cli-gen
+test: vet lint staticcheck unit-test-core
 	@$(OK) unit-tests pass

-test-cli-gen: 
-	mkdir -p ./bin/doc
-	go run ./hack/docgen/gen.go ./bin/doc
 unit-test-core:
 	go test -coverprofile=coverage.txt $(shell go list ./pkg/... ./cmd/... ./apis/... | grep -v apiserver)
 	go test $(shell go list ./references/... | grep -v apiserver)
@@ -48,7 +45,7 @@ staticcheck: staticchecktool
 lint: golangci
 	$(GOLANGCILINT) run ./...

-reviewable: manifests fmt vet lint staticcheck helm-doc-gen
+reviewable: manifests fmt vet lint staticcheck
 	go mod tidy

 # Execute auto-gen code commands and ensure branch is clean.
@@ -83,7 +80,7 @@ endif


 # load docker image to the kind cluster
-kind-load: kind-load-runtime-cluster
+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; }

@@ -91,7 +88,6 @@ 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)  || { echo >&2 "kind not installed or error loading image: $(VELA_RUNTIME_ROLLOUT_TEST_IMAGE)"; exit 1; }
 	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
@@ -130,7 +126,3 @@ check-license-header:
 def-install:
 	./hack/utils/installdefinition.sh

-helm-doc-gen: helmdoc
-	readme-generator -v charts/vela-core/values.yaml -r charts/vela-core/README.md
-	cat charts/vela-core/README.md
-	readme-generator -v charts/vela-minimal/values.yaml -r charts/vela-minimal/README.md
--- a/92
+++ b/92
@@ -1,56 +1,44 @@
-Reviewers:
- Ghostbaby
- StevenLeiZhang
- chwetion
- yue9944882
- zxbyoyoyo
- reetasingh
- wangwang
- evanli18
+aliases:
+  kubevela-devex:
+  - hongchaodeng
+  - wonderflow

-Approvers:
- Somefive (Multi-Cluster)
- chivalryq (Vela CLI)
- sunny0826 (kubevela.io)
- hanxie-crypto (VelaUX)
- FogDong (Workflow)
- wangyikewxgm (Addon)
- yangsoon (VelaQL）
+  kubevela-dashboard-approver:
+  - zzxwill
+  - hongchaodeng

-Maintainers:
- wonderflow
- hongchaodeng
- captainroy-hy
- resouer
- barnettZQG
- leejanee
- zzxwill
- BinaryHB0916
+  kubevela-dashboard-reviewer:
+  - sunny0826 
+  - hanxie-crypto

-Emeritus Members:
- ryanzhang-oss
- Fei-Guo
- szihai
- xiaoyuaiheshui
- wenxinnnnn
- silenceper
- erdun
- mosesyou
- artursouza
- woshilanren11
+  kubevela-controller:
+  - resouer
+  - wonderflow
+  - hongchaodeng
+  - zzxwill
+  - ryanzhang-oss
+  - captainroy-hy

-bootstrap-contributors:     # thank you for bootstrapping KubeVela at the very early stage!
- xiaoyuaiheshui
- Ghostbaby
- wenxinnnnn
- silenceper
- erdun
- sunny0826
- mosesyou
- artursouza
- wonderflow
- hongchaodeng
- ryanzhang-oss
- woshilanren11
- hanxie-crypto
- zzxwill
+  oam-spec:                   # inherit from https://github.com/oam-dev/spec/blob/master/OWNERS.md
+  - hongchaodeng
+  - resouer
+
+  community-collaborators:
+  - Fei-Guo
+  - szihai
+
+  bootstrap-contributors:     # thank you for bootstrapping KubeVela at the very early stage!
+  - xiaoyuaiheshui
+  - Ghostbaby
+  - wenxinnnnn
+  - silenceper
+  - erdun
+  - sunny0826
+  - mosesyou
+  - artursouza
+  - wonderflow
+  - hongchaodeng
+  - ryanzhang-oss
+  - woshilanren11
+  - hanxie-crypto
+  - zzxwill
--- a/apis/core.oam.dev/common/types.go
+++ b/apis/core.oam.dev/common/types.go
@@ -20,11 +20,12 @@ import (
 	"encoding/json"
 	"errors"

-	"github.com/oam-dev/terraform-controller/api/v1beta2"
+	"github.com/oam-dev/terraform-controller/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 	"github.com/oam-dev/kubevela/apis/standard.oam.dev/v1alpha1"
@@ -119,7 +120,7 @@ type Terraform struct {
 	// Path is the sub-directory of remote git repository. It's valid when remote is set
 	Path string `json:"path,omitempty"`

-	v1beta2.BaseConfigurationSpec `json:",inline"`
+	v1beta1.BaseConfigurationSpec `json:",inline"`
 }

 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -218,10 +219,8 @@ const (

 // ApplicationComponentStatus record the health status of App component
 type ApplicationComponentStatus struct {
-	Name      string `json:"name"`
-	Namespace string `json:"namespace,omitempty"`
-	Cluster   string `json:"cluster,omitempty"`
-	Env       string `json:"env,omitempty"`
+	Name string `json:"name"`
+	Env  string `json:"env,omitempty"`
 	// WorkloadDefinition is the definition of a WorkloadDefinition, such as deployments/apps.v1
 	WorkloadDefinition WorkloadGVK              `json:"workloadDefinition,omitempty"`
 	Healthy            bool                     `json:"healthy"`
@@ -300,6 +299,10 @@ type AppStatus struct {
 	// Services record the status of the application services
 	Services []ApplicationComponentStatus `json:"services,omitempty"`

+	// Deprecated
+	// ResourceTracker record the status of the ResourceTracker
+	ResourceTracker *corev1.ObjectReference `json:"resourceTracker,omitempty"`
+
 	// Workflow record the status of workflow
 	Workflow *WorkflowStatus `json:"workflow,omitempty"`

--- a/apis/core.oam.dev/common/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/common/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -58,6 +57,11 @@ func (in *AppStatus) DeepCopyInto(out *AppStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.ResourceTracker != nil {
+		in, out := &in.ResourceTracker, &out.ResourceTracker
+		*out = new(v1.ObjectReference)
+		**out = **in
+	}
 	if in.Workflow != nil {
 		in, out := &in.Workflow, &out.Workflow
 		*out = new(WorkflowStatus)
--- a/apis/core.oam.dev/condition/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/condition/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/core.oam.dev/v1alpha1/envbinding_types.go
+++ b/apis/core.oam.dev/v1alpha1/envbinding_types.go
@@ -115,11 +115,6 @@ type PlacementDecision struct {
 	Namespace string `json:"namespace"`
 }

-// String encode placement decision
-func (in PlacementDecision) String() string {
-	return in.Cluster + "/" + in.Namespace
-}
-
 // EnvStatus records the status of one env
 type EnvStatus struct {
 	Env        string              `json:"env"`
--- a/apis/core.oam.dev/v1alpha1/external_types.go
+++ b/apis/core.oam.dev/v1alpha1/external_types.go
@@ -1,75 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
-)
-
-// +kubebuilder:object:root=true
-
-// Policy is the Schema for the policy API
-// +kubebuilder:storageversion
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.type`
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type Policy struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Type string `json:"type"`
-	// +kubebuilder:pruning:PreserveUnknownFields
-	Properties *runtime.RawExtension `json:"properties,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// PolicyList contains a list of Policy
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type PolicyList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Policy `json:"items"`
-}
-
-// +kubebuilder:object:root=true
-
-// Workflow is the Schema for the policy API
-// +kubebuilder:storageversion
-// +kubebuilder:resource:categories={oam}
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type Workflow struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Steps []v1beta1.WorkflowStep `json:"steps,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// WorkflowList contains a list of Workflow
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type WorkflowList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Workflow `json:"items"`
-}
--- a/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
+++ b/apis/core.oam.dev/v1alpha1/garbagecollect_types.go
@@ -45,11 +45,8 @@ type GarbageCollectPolicyRule struct {
 }

 // GarbageCollectPolicyRuleSelector select the targets of the rule
-// if both traitTypes and componentTypes are specified, combination logic is OR
-// if one resources are specified with conflict strategy, strategy as component go first.
 type GarbageCollectPolicyRuleSelector struct {
 	TraitTypes []string `json:"traitTypes"`
-	CompTypes  []string `json:"componentTypes"`
 }

 // GarbageCollectStrategy the strategy for target resource to recycle
@@ -68,20 +65,9 @@ const (
 // FindStrategy find gc strategy for target resource
 func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
 	for _, rule := range in.Rules {
-		var (
-			compType  string
-			traitType string
-		)
+		var traitType string
 		if manifest.GetLabels() != nil {
 			traitType = manifest.GetLabels()[oam.TraitTypeLabel]
-			compType = manifest.GetLabels()[oam.WorkloadTypeLabel]
-		}
-		if compType != "" {
-			for _, _compType := range rule.Selector.CompTypes {
-				if _compType == compType {
-					return &rule.Strategy
-				}
-			}
 		}
 		if traitType != "" {
 			for _, _traitType := range rule.Selector.TraitTypes {
--- a/apis/core.oam.dev/v1alpha1/garbagecollect_types_test.go
+++ b/apis/core.oam.dev/v1alpha1/garbagecollect_types_test.go
@@ -67,36 +67,6 @@ func TestGarbageCollectPolicySpec_FindStrategy(t *testing.T) {
 			}},
 			expectStrategy: GarbageCollectStrategyOnAppDelete,
 		},
-		"component rule match": {
-			rules: []GarbageCollectPolicyRule{{
-				Selector: GarbageCollectPolicyRuleSelector{CompTypes: []string{"comp"}},
-				Strategy: GarbageCollectStrategyNever,
-			}},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.WorkloadTypeLabel: "comp"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
-		"rule match both component and trait, component first": {
-			rules: []GarbageCollectPolicyRule{
-				{
-					Selector: GarbageCollectPolicyRuleSelector{CompTypes: []string{"comp"}},
-					Strategy: GarbageCollectStrategyNever,
-				},
-				{
-					Selector: GarbageCollectPolicyRuleSelector{TraitTypes: []string{"trait"}},
-					Strategy: GarbageCollectStrategyOnAppDelete,
-				},
-			},
-			input: &unstructured.Unstructured{Object: map[string]interface{}{
-				"metadata": map[string]interface{}{
-					"labels": map[string]interface{}{oam.WorkloadTypeLabel: "comp", oam.TraitTypeLabel: "trait"},
-				},
-			}},
-			expectStrategy: GarbageCollectStrategyNever,
-		},
 	}
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
--- a/apis/core.oam.dev/v1alpha1/policy_types.go
+++ b/apis/core.oam.dev/v1alpha1/policy_types.go
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-const (
-	// TopologyPolicyType refers to the type of topology policy
-	TopologyPolicyType = "topology"
-	// OverridePolicyType refers to the type of override policy
-	OverridePolicyType = "override"
-)
-
-// TopologyPolicySpec defines the spec of topology policy
-type TopologyPolicySpec struct {
-	Clusters        []string          `json:"clusters,omitempty"`
-	ClusterSelector map[string]string `json:"clusterSelector,omitempty"`
-}
-
-// OverridePolicySpec defines the spec of override policy
-type OverridePolicySpec struct {
-	Components []EnvComponentPatch `json:"components,omitempty"`
-	Selector   []string            `json:"selector,omitempty"`
-}
--- a/apis/core.oam.dev/v1alpha1/register.go
+++ b/apis/core.oam.dev/v1alpha1/register.go
@@ -33,12 +33,7 @@ var (

 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
-	// AddToScheme is a global function that registers this API group & version to a scheme
-	AddToScheme = SchemeBuilder.AddToScheme
 )

 func init() {
-	SchemeBuilder.Register(&Policy{}, &PolicyList{})
-	SchemeBuilder.Register(&Workflow{}, &WorkflowList{})
 }
--- a/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1alpha1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
@@ -25,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"

 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
 )

 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -287,11 +285,6 @@ func (in *GarbageCollectPolicyRuleSelector) DeepCopyInto(out *GarbageCollectPoli
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.CompTypes != nil {
-		in, out := &in.CompTypes, &out.CompTypes
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 }

 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GarbageCollectPolicyRuleSelector.
@@ -348,33 +341,6 @@ func (in *NamespaceSelector) DeepCopy() *NamespaceSelector {
 	return out
 }

-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OverridePolicySpec) DeepCopyInto(out *OverridePolicySpec) {
-	*out = *in
-	if in.Components != nil {
-		in, out := &in.Components, &out.Components
-		*out = make([]EnvComponentPatch, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OverridePolicySpec.
-func (in *OverridePolicySpec) DeepCopy() *OverridePolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(OverridePolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PlacementDecision) DeepCopyInto(out *PlacementDecision) {
 	*out = *in
@@ -389,156 +355,3 @@ func (in *PlacementDecision) DeepCopy() *PlacementDecision {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Policy) DeepCopyInto(out *Policy) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Properties != nil {
-		in, out := &in.Properties, &out.Properties
-		*out = new(runtime.RawExtension)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Policy.
-func (in *Policy) DeepCopy() *Policy {
-	if in == nil {
-		return nil
-	}
-	out := new(Policy)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Policy) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PolicyList) DeepCopyInto(out *PolicyList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Policy, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyList.
-func (in *PolicyList) DeepCopy() *PolicyList {
-	if in == nil {
-		return nil
-	}
-	out := new(PolicyList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *PolicyList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TopologyPolicySpec) DeepCopyInto(out *TopologyPolicySpec) {
-	*out = *in
-	if in.Clusters != nil {
-		in, out := &in.Clusters, &out.Clusters
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.ClusterSelector != nil {
-		in, out := &in.ClusterSelector, &out.ClusterSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TopologyPolicySpec.
-func (in *TopologyPolicySpec) DeepCopy() *TopologyPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(TopologyPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Workflow) DeepCopyInto(out *Workflow) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	if in.Steps != nil {
-		in, out := &in.Steps, &out.Steps
-		*out = make([]v1beta1.WorkflowStep, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Workflow.
-func (in *Workflow) DeepCopy() *Workflow {
-	if in == nil {
-		return nil
-	}
-	out := new(Workflow)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Workflow) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowList) DeepCopyInto(out *WorkflowList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Workflow, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowList.
-func (in *WorkflowList) DeepCopy() *WorkflowList {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *WorkflowList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
--- a/apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1alpha2/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/core.oam.dev/v1beta1/application_types.go
+++ b/apis/core.oam.dev/v1beta1/application_types.go
@@ -68,7 +68,6 @@ type WorkflowStep struct {

 // Workflow defines workflow steps and other attributes
 type Workflow struct {
-	Ref   string         `json:"ref,omitempty"`
 	Steps []WorkflowStep `json:"steps,omitempty"`
 }

--- a/apis/core.oam.dev/v1beta1/policy_definition.go
+++ b/apis/core.oam.dev/v1beta1/policy_definition.go
@@ -61,7 +61,7 @@ func (d *PolicyDefinition) GetCondition(conditionType condition.ConditionType) c
 // +kubebuilder:object:root=true

 // PolicyDefinition is the Schema for the policydefinitions API
-// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=def-policy
+// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=policy
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +genclient
--- a/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
+++ b/apis/core.oam.dev/v1beta1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/standard.oam.dev/v1alpha1/zz_generated.deepcopy.go
@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

 /*
--- a/apis/types/types.go
+++ b/apis/types/types.go
@@ -19,6 +19,8 @@ package types
 import "github.com/oam-dev/kubevela/pkg/oam"

 const (
+	// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
+	DefaultKubeVelaNS = "vela-system"
 	// DefaultKubeVelaReleaseName defines the default name of KubeVela Release
 	DefaultKubeVelaReleaseName = "kubevela"
 	// DefaultKubeVelaChartName defines the default chart name of KubeVela, this variable MUST align to the chart name of this repo
@@ -31,13 +33,8 @@ const (
 	DefaultAppNamespace = "default"
 	// AutoDetectWorkloadDefinition defines the default workload type for ComponentDefinition which doesn't specify a workload
 	AutoDetectWorkloadDefinition = "autodetects.core.oam.dev"
-	// KubeVelaControllerDeployment defines the KubeVela controller's deployment name
-	KubeVelaControllerDeployment = "kubevela-vela-core"
 )

-// DefaultKubeVelaNS defines the default KubeVela namespace in Kubernetes
-var DefaultKubeVelaNS = "vela-system"
-
 const (
 	// AnnoDefinitionDescription is the annotation which describe what is the capability used for in a WorkloadDefinition/TraitDefinition Object
 	AnnoDefinitionDescription = "definition.oam.dev/description"
@@ -116,3 +113,11 @@ var DefaultFilterAnnots = []string{
 	oam.AnnotationFilterAnnotationKeys,
 	oam.AnnotationLastAppliedConfiguration,
 }
+
+// Cluster contains base info of cluster
+type Cluster struct {
+	Name     string
+	Type     string
+	EndPoint string
+	Accepted bool
+}
--- a/charts/oam-runtime/crds/core.oam.dev_traitdefinitions.yaml
+++ b/charts/oam-runtime/crds/core.oam.dev_traitdefinitions.yaml
@@ -188,10 +188,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -215,6 +211,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -497,10 +497,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -524,6 +520,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/oam-runtime/crds/core.oam.dev_workloaddefinitions.yaml
+++ b/charts/oam-runtime/crds/core.oam.dev_workloaddefinitions.yaml
@@ -193,10 +193,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -220,6 +216,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -483,10 +483,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -510,6 +506,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -35,10 +35,6 @@ spec:
            - --cert-name=tls.crt
      restartPolicy: OnFailure
      serviceAccountName: {{ template "oam-runtime.fullname" . }}-admission
-      {{- with .Values.admissionWebhooks.patch.nodeSelector }}
-      nodeSelector:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
      {{- with .Values.admissionWebhooks.patch.affinity }}
      affinity:
 {{ toYaml . | indent 8 }}
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -34,17 +34,13 @@ spec:
            - --patch-failure-policy={{ .Values.admissionWebhooks.failurePolicy }}
      restartPolicy: OnFailure
      serviceAccountName: {{ template "oam-runtime.fullname" . }}-admission
-      {{- with .Values.admissionWebhooks.patch.nodeSelector }}
-      nodeSelector:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
      {{- with .Values.admissionWebhooks.patch.affinity }}
      affinity:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
      {{- end }}
      {{- with .Values.admissionWebhooks.patch.tolerations }}
      tolerations:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
      {{- end }}
      securityContext:
        runAsGroup: 2000
--- a/charts/oam-runtime/templates/oam-runtime-controller.yaml
+++ b/charts/oam-runtime/templates/oam-runtime-controller.yaml
@@ -126,7 +126,6 @@ spec:
            {{ end }}
            - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
            - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-            - "--concurrent-reconciles={{ .Values.concurrentReconciles }}"
          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
--- a/charts/oam-runtime/values.yaml
+++ b/charts/oam-runtime/values.yaml
@@ -73,7 +73,6 @@ admissionWebhooks:
      repository: oamdev/kube-webhook-certgen
      tag: v2.3
      pullPolicy: IfNotPresent
-    nodeSelector: {}
    affinity: {}
    tolerations: []
  certManager:
--- a/charts/vela-core/Chart.yaml
+++ b/charts/vela-core/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 appVersion: 0.1.0

 home: https://kubevela.io
-icon: https://kubevela.io/img/logo.svg
+icon: https://kubevela.io/img/logo.jpg
--- a/charts/vela-core/README.md
+++ b/charts/vela-core/README.md
@@ -1,162 +0,0 @@
-<div style="text-align: center">
-  <p align="center">
-    <img src="https://raw.githubusercontent.com/oam-dev/kubevela.io/main/docs/resources/KubeVela-03.png">
-    <br><br>
-    <i>Make shipping applications more enjoyable.</i>
-  </p>
-</div>
-
-![Build status](https://github.com/oam-dev/kubevela/workflows/E2E/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/oam-dev/kubevela)](https://goreportcard.com/report/github.com/oam-dev/kubevela)
-![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
-[![codecov](https://codecov.io/gh/oam-dev/kubevela/branch/master/graph/badge.svg)](https://codecov.io/gh/oam-dev/kubevela)
-[![LICENSE](https://img.shields.io/github/license/oam-dev/kubevela.svg?style=flat-square)](/LICENSE)
-[![Releases](https://img.shields.io/github/release/oam-dev/kubevela/all.svg?style=flat-square)](https://github.com/oam-dev/kubevela/releases)
-[![TODOs](https://img.shields.io/endpoint?url=https://api.tickgit.com/badge?repo=github.com/oam-dev/kubevela)](https://www.tickgit.com/browse?repo=github.com/oam-dev/kubevela)
-[![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Foam_dev)](https://twitter.com/oam_dev)
-[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kubevela)](https://artifacthub.io/packages/search?repo=kubevela)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4602/badge)](https://bestpractices.coreinfrastructure.org/projects/4602)
-
-# KubeVela helm chart
-
-KubeVela is a modern application platform that makes it easier and faster to deliver and manage applications across hybrid,
-multi-cloud environments. At the mean time, it is highly extensible and programmable, which can adapt to your needs as they grow.
-
-## TL;DR
-
-```bash
-helm repo add kubevela https://charts.kubevela.net/core
-helm repo update
-helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wait
-```
-
-## Prerequisites
-
- Kubernetes >= v1.19 && < v1.22
-  
-## Parameters
-
-### KubeVela core parameters
-
-| Name                          | Description                                                                                   | Value     |
-| ----------------------------- | --------------------------------------------------------------------------------------------- | --------- |
-| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`     |
-| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`      |
-| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`      |
-| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`       |
-| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`      |
-| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `v0.3`    |
-| `disableCaps`                 | Disable capability                                                                            | `rollout` |
-| `enableFluxcdAddon`           | Whether to enable fluxcd addon                                                                | `false`   |
-| `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`     |
-
-
-### KubeVela workflow parameters
-
-| Name                                   | Description                                            | Value |
-| -------------------------------------- | ------------------------------------------------------ | ----- |
-| `workflow.backoff.maxTime.waitState`   | The max backoff time of workflow in a wait condition   | `60`  |
-| `workflow.backoff.maxTime.failedState` | The max backoff time of workflow in a failed condition | `300` |
-| `workflow.step.errorRetryTimes`        | The max retry times of a failed workflow step          | `10`  |
-
-
-### KubeVela controller parameters
-
-| Name                        | Description                          | Value              |
-| --------------------------- | ------------------------------------ | ------------------ |
-| `replicaCount`              | KubeVela controller replica count    | `1`                |
-| `imageRegistry`             | Image registry                       | `""`               |
-| `image.repository`          | Image repository                     | `oamdev/vela-core` |
-| `image.tag`                 | Image tag                            | `latest`           |
-| `image.pullPolicy`          | Image pull policy                    | `Always`           |
-| `resources.limits.cpu`      | KubeVela controller's cpu limit      | `500m`             |
-| `resources.limits.memory`   | KubeVela controller's memory limit   | `1Gi`              |
-| `resources.requests.cpu`    | KubeVela controller's cpu request    | `50m`              |
-| `resources.requests.memory` | KubeVela controller's memory request | `20Mi`             |
-| `webhookService.type`       | KubeVela webhook service type        | `ClusterIP`        |
-| `webhookService.port`       | KubeVela webhook service port        | `9443`             |
-| `healthCheck.port`          | KubeVela health check port           | `9440`             |
-
-
-### MultiCluster parameters
-
-| Name                                                  | Description                      | Value                            |
-| ----------------------------------------------------- | -------------------------------- | -------------------------------- |
-| `multicluster.enabled`                                | Whether to enable multi-cluster  | `true`                           |
-| `multicluster.clusterGateway.replicaCount`            | ClusterGateway replica count     | `1`                              |
-| `multicluster.clusterGateway.port`                    | ClusterGateway port              | `9443`                           |
-| `multicluster.clusterGateway.image.repository`        | ClusterGateway image repository  | `oamdev/cluster-gateway`         |
-| `multicluster.clusterGateway.image.tag`               | ClusterGateway image tag         | `v1.1.7`                         |
-| `multicluster.clusterGateway.image.pullPolicy`        | ClusterGateway image pull policy | `IfNotPresent`                   |
-| `multicluster.clusterGateway.resources.limits.cpu`    | ClusterGateway cpu limit         | `100m`                           |
-| `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit      | `200Mi`                          |
-| `multicluster.clusterGateway.secureTLS.enabled`       | Whether to enable secure TLS     | `true`                           |
-| `multicluster.clusterGateway.secureTLS.certPath`      | Path to the certificate file     | `/etc/k8s-cluster-gateway-certs` |
-
-
-### Test parameters
-
-| Name                  | Description         | Value                |
-| --------------------- | ------------------- | -------------------- |
-| `test.app.repository` | Test app repository | `oamdev/hello-world` |
-| `test.app.tag`        | Test app tag        | `v1`                 |
-| `test.k8s.repository` | Test k8s repository | `oamdev/alpine-k8s`  |
-| `test.k8s.tag`        | Test k8s tag        | `1.18.2`             |
-
-
-### Common parameters
-
-| Name                         | Description                                                                                                                | Value   |
-| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `imagePullSecrets`           | Image pull secrets                                                                                                         | `[]`    |
-| `nameOverride`               | Override name                                                                                                              | `""`    |
-| `fullnameOverride`           | Fullname override                                                                                                          | `""`    |
-| `serviceAccount.create`      | Specifies whether a service account should be created                                                                      | `true`  |
-| `serviceAccount.annotations` | Annotations to add to the service account                                                                                  | `{}`    |
-| `serviceAccount.name`        | The name of the service account to use. If not set and create is true, a name is generated using the fullname template     | `nil`   |
-| `nodeSelector`               | Node selector                                                                                                              | `{}`    |
-| `tolerations`                | Tolerations                                                                                                                | `[]`    |
-| `affinity`                   | Affinity                                                                                                                   | `{}`    |
-| `rbac.create`                | Specifies whether a RBAC role should be created                                                                            | `true`  |
-| `logDebug`                   | Enable debug logs for development purpose                                                                                  | `false` |
-| `logFilePath`                | If non-empty, write log files in this path                                                                                 | `""`    |
-| `logFileMaxSize`             | Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. | `1024`  |
-| `kubeClient.qps`             | The qps for reconcile clients, default is 50                                                                               | `50`    |
-| `kubeClient.burst`           | The burst for reconcile clients, default is 100                                                                            | `100`   |
-
-
-## Uninstalling the Chart
-
-To uninstall/delete the KubeVela helm release
-
-```shell
-$ helm uninstall -n vela-system kubevela
-```
-
-The command removes all the Kubernetes components associated with kubevela and deletes the release.
-
-**Notice**: If you enable fluxcd addon  when install the chart by set `enableFluxcdAddon=true` .Uninstall wouldn't disable the fluxcd addon ,and it will be kept in the cluster.Please guarantee there is no application in cluster use this addon and disable it firstly before uninstall the helm chart. 
-You can use this script to disable all addons.
-```shell
-#! /bin/sh
-addon=$(vela addon list|grep enabled|awk {'print $1'})
-
-fluxcd=false
-for var in ${addon[*]}
-do
-  if [ $var == "fluxcd" ]; then
-      fluxcd=true
-      continue
-      else
-        vela addon disable $var
-  fi
-done
-if [ $fluxcd ]; then
-    vela addon disable fluxcd
-fi
-```
-
-
-
-
-
--- a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml
@@ -639,6 +639,44 @@ spec:
                          - type
                          type: object
                        type: array
+                      resourceTracker:
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
+                        properties:
+                          apiVersion:
+                            description: API version of the referent.
+                            type: string
+                          fieldPath:
+                            description: 'If referring to a piece of an object instead
+                              of an entire object, this string should contain a valid
+                              JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                              For example, if the object reference is to a container
+                              within a pod, this would take on a value like: "spec.containers{name}"
+                              (where "name" refers to the name of the container that
+                              triggered the event) or if no container name is specified
+                              "spec.containers[2]" (container with index 2 in this
+                              pod). This syntax is chosen only to have some well-defined
+                              way of referencing a part of an object. TODO: this design
+                              is not final and this field is subject to change in
+                              the future.'
+                            type: string
+                          kind:
+                            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            type: string
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          namespace:
+                            description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                            type: string
+                          resourceVersion:
+                            description: 'Specific resourceVersion to which this reference
+                              is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                            type: string
+                          uid:
+                            description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            type: string
+                        type: object
                      services:
                        description: Services record the status of the application
                          services
@@ -646,8 +684,6 @@ spec:
                          description: ApplicationComponentStatus record the health
                            status of App component
                          properties:
-                            cluster:
-                              type: string
                            env:
                              type: string
                            healthy:
@@ -656,8 +692,6 @@ spec:
                              type: string
                            name:
                              type: string
-                            namespace:
-                              type: string
                            scopes:
                              items:
                                description: 'ObjectReference contains enough information
@@ -1127,11 +1161,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -1156,6 +1185,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -1562,11 +1596,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -1591,6 +1620,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -1895,11 +1929,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -1924,6 +1953,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -2191,8 +2225,6 @@ spec:
                          a context in annotation. - should mark "finish" phase in
                          status.conditions.'
                        properties:
-                          ref:
-                            type: string
                          steps:
                            items:
                              description: WorkflowStep defines how to execute a workflow
@@ -2442,6 +2474,44 @@ spec:
                          - type
                          type: object
                        type: array
+                      resourceTracker:
+                        description: Deprecated ResourceTracker record the status
+                          of the ResourceTracker
+                        properties:
+                          apiVersion:
+                            description: API version of the referent.
+                            type: string
+                          fieldPath:
+                            description: 'If referring to a piece of an object instead
+                              of an entire object, this string should contain a valid
+                              JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                              For example, if the object reference is to a container
+                              within a pod, this would take on a value like: "spec.containers{name}"
+                              (where "name" refers to the name of the container that
+                              triggered the event) or if no container name is specified
+                              "spec.containers[2]" (container with index 2 in this
+                              pod). This syntax is chosen only to have some well-defined
+                              way of referencing a part of an object. TODO: this design
+                              is not final and this field is subject to change in
+                              the future.'
+                            type: string
+                          kind:
+                            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            type: string
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          namespace:
+                            description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                            type: string
+                          resourceVersion:
+                            description: 'Specific resourceVersion to which this reference
+                              is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                            type: string
+                          uid:
+                            description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            type: string
+                        type: object
                      services:
                        description: Services record the status of the application
                          services
@@ -2449,8 +2519,6 @@ spec:
                          description: ApplicationComponentStatus record the health
                            status of App component
                          properties:
-                            cluster:
-                              type: string
                            env:
                              type: string
                            healthy:
@@ -2459,8 +2527,6 @@ spec:
                              type: string
                            name:
                              type: string
-                            namespace:
-                              type: string
                            scopes:
                              items:
                                description: 'ObjectReference contains enough information
@@ -2930,11 +2996,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -2959,6 +3020,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -3258,11 +3324,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -3287,6 +3348,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -3675,11 +3741,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -3704,6 +3765,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -3971,11 +4037,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -4000,6 +4061,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
@@ -4287,11 +4353,6 @@ spec:
                                configuration:
                                  description: Configuration is Terraform Configuration
                                  type: string
-                                customRegion:
-                                  description: Region is cloud provider's region.
-                                    It will override the region in the region field
-                                    of ProviderReference
-                                  type: string
                                deleteResource:
                                  default: true
                                  description: DeleteResource will determine whether
@@ -4316,6 +4377,11 @@ spec:
                                  required:
                                  - name
                                  type: object
+                                region:
+                                  description: Region is cloud provider's region.
+                                    It will override the region in the region field
+                                    of ProviderReference
+                                  type: string
                                type:
                                  default: hcl
                                  description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_applications.yaml
+++ b/charts/vela-core/crds/core.oam.dev_applications.yaml
@@ -460,13 +460,36 @@ spec:
                  - type
                  type: object
                type: array
+              resourceTracker:
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                    type: string
+                  kind:
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                    type: string
+                  namespace:
+                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                    type: string
+                  resourceVersion:
+                    description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                    type: string
+                  uid:
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                    type: string
+                type: object
              services:
                description: Services record the status of the application services
                items:
                  description: ApplicationComponentStatus record the health status of App component
                  properties:
-                    cluster:
-                      type: string
                    env:
                      type: string
                    healthy:
@@ -475,8 +498,6 @@ spec:
                      type: string
                    name:
                      type: string
-                    namespace:
-                      type: string
                    scopes:
                      items:
                        description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs.  1. Ignored fields.  It includes many fields which are not generally honored.  For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage.  2. Invalid usage help.  It is impossible to add specific help for individual usage.  In most embedded usages, there are particular     restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted".     Those cannot be well described when embedded.  3. Inconsistent validation.  Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen.  4. The fields are both imprecise and overly precise.  Kind is not a precise mapping to a URL. This can produce ambiguity     during interpretation and require a REST mapping.  In most cases, the dependency is on the group,resource tuple     and the version of the actual struct is irrelevant.  5. We cannot easily change it.  Because this type is embedded in many locations, updates to this type     will affect numerous schemas.  Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
@@ -782,8 +803,6 @@ spec:
              workflow:
                description: 'Workflow defines how to customize the control logic. If workflow is specified, Vela won''t apply any resource, but provide rendered output in AppRevision. Workflow steps are executed in array order, and each step: - will have a context in annotation. - should mark "finish" phase in status.conditions.'
                properties:
-                  ref:
-                    type: string
                  steps:
                    items:
                      description: WorkflowStep defines how to execute a workflow step.
@@ -963,13 +982,36 @@ spec:
                  - type
                  type: object
                type: array
+              resourceTracker:
+                description: Deprecated ResourceTracker record the status of the ResourceTracker
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                    type: string
+                  kind:
+                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                    type: string
+                  name:
+                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                    type: string
+                  namespace:
+                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                    type: string
+                  resourceVersion:
+                    description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                    type: string
+                  uid:
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                    type: string
+                type: object
              services:
                description: Services record the status of the application services
                items:
                  description: ApplicationComponentStatus record the health status of App component
                  properties:
-                    cluster:
-                      type: string
                    env:
                      type: string
                    healthy:
@@ -978,8 +1020,6 @@ spec:
                      type: string
                    name:
                      type: string
-                    namespace:
-                      type: string
                    scopes:
                      items:
                        description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs.  1. Ignored fields.  It includes many fields which are not generally honored.  For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage.  2. Invalid usage help.  It is impossible to add specific help for individual usage.  In most embedded usages, there are particular     restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted".     Those cannot be well described when embedded.  3. Inconsistent validation.  Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen.  4. The fields are both imprecise and overly precise.  Kind is not a precise mapping to a URL. This can produce ambiguity     during interpretation and require a REST mapping.  In most cases, the dependency is on the group,resource tuple     and the version of the actual struct is irrelevant.  5. We cannot easily change it.  Because this type is embedded in many locations, updates to this type     will affect numerous schemas.  Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
--- a/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml
@@ -179,10 +179,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -206,6 +202,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -492,10 +492,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -519,6 +515,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_definitionrevisions.yaml
@@ -222,11 +222,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              customRegion:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              deleteResource:
                                default: true
                                description: DeleteResource will determine whether
@@ -251,6 +246,11 @@ spec:
                                required:
                                - name
                                type: object
+                              region:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -538,11 +538,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              customRegion:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              deleteResource:
                                default: true
                                description: DeleteResource will determine whether
@@ -567,6 +562,11 @@ spec:
                                required:
                                - name
                                type: object
+                              region:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -847,11 +847,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              customRegion:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              deleteResource:
                                default: true
                                description: DeleteResource will determine whether
@@ -876,6 +871,11 @@ spec:
                                required:
                                - name
                                type: object
+                              region:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
@@ -1137,11 +1137,6 @@ spec:
                              configuration:
                                description: Configuration is Terraform Configuration
                                type: string
-                              customRegion:
-                                description: Region is cloud provider's region. It
-                                  will override the region in the region field of
-                                  ProviderReference
-                                type: string
                              deleteResource:
                                default: true
                                description: DeleteResource will determine whether
@@ -1166,6 +1161,11 @@ spec:
                                required:
                                - name
                                type: object
+                              region:
+                                description: Region is cloud provider's region. It
+                                  will override the region in the region field of
+                                  ProviderReference
+                                type: string
                              type:
                                default: hcl
                                description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_policies.yaml
+++ b/charts/vela-core/crds/core.oam.dev_policies.yaml
@@ -1,57 +0,0 @@
-
---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  name: policies.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: Policy
-    listKind: PolicyList
-    plural: policies
-    singular: policy
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .type
-      name: TYPE
-      type: string
-    name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: Policy is the Schema for the policy API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          properties:
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-          type:
-            type: string
-        required:
-        - type
-        type: object
-    served: true
-    storage: true
-    subresources: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_policydefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_policydefinitions.yaml
@@ -15,7 +15,7 @@ spec:
    listKind: PolicyDefinitionList
    plural: policydefinitions
    shortNames:
-    - def-policy
+    - policy
    singular: policydefinition
  scope: Namespaced
  versions:
@@ -151,10 +151,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -178,6 +174,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml
@@ -188,10 +188,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -215,6 +211,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -497,10 +497,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -524,6 +520,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_workflows.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workflows.yaml
@@ -1,149 +0,0 @@
-
---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  name: workflows.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: Workflow
-    listKind: WorkflowList
-    plural: workflows
-    singular: workflow
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: Workflow is the Schema for the policy API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          steps:
-            items:
-              description: WorkflowStep defines how to execute a workflow step.
-              properties:
-                dependsOn:
-                  items:
-                    type: string
-                  type: array
-                inputs:
-                  description: StepInputs defines variable input of WorkflowStep
-                  items:
-                    properties:
-                      from:
-                        type: string
-                      parameterKey:
-                        type: string
-                    required:
-                    - from
-                    - parameterKey
-                    type: object
-                  type: array
-                name:
-                  description: Name is the unique name of the workflow step.
-                  type: string
-                outputs:
-                  description: StepOutputs defines output variable of WorkflowStep
-                  items:
-                    properties:
-                      name:
-                        type: string
-                      valueFrom:
-                        type: string
-                    required:
-                    - name
-                    - valueFrom
-                    type: object
-                  type: array
-                properties:
-                  type: object
-                  x-kubernetes-preserve-unknown-fields: true
-                type:
-                  type: string
-              required:
-              - name
-              - type
-              type: object
-            type: array
-        type: object
-    served: true
-    storage: true
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: Workflow defines workflow steps and other attributes
-        properties:
-          ref:
-            type: string
-          steps:
-            items:
-              description: WorkflowStep defines how to execute a workflow step.
-              properties:
-                dependsOn:
-                  items:
-                    type: string
-                  type: array
-                inputs:
-                  description: StepInputs defines variable input of WorkflowStep
-                  items:
-                    properties:
-                      from:
-                        type: string
-                      parameterKey:
-                        type: string
-                    required:
-                    - from
-                    - parameterKey
-                    type: object
-                  type: array
-                name:
-                  description: Name is the unique name of the workflow step.
-                  type: string
-                outputs:
-                  description: StepOutputs defines output variable of WorkflowStep
-                  items:
-                    properties:
-                      name:
-                        type: string
-                      valueFrom:
-                        type: string
-                    required:
-                    - name
-                    - valueFrom
-                    type: object
-                  type: array
-                properties:
-                  type: object
-                  x-kubernetes-preserve-unknown-fields: true
-                type:
-                  type: string
-              required:
-              - name
-              - type
-              type: object
-            type: array
-        type: object
-    served: true
-    storage: false
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
--- a/charts/vela-core/crds/core.oam.dev_workflowstepdefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workflowstepdefinitions.yaml
@@ -148,10 +148,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -175,6 +171,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
+++ b/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml
@@ -193,10 +193,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -220,6 +216,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
@@ -483,10 +483,6 @@ spec:
                      configuration:
                        description: Configuration is Terraform Configuration
                        type: string
-                      customRegion:
-                        description: Region is cloud provider's region. It will override
-                          the region in the region field of ProviderReference
-                        type: string
                      deleteResource:
                        default: true
                        description: DeleteResource will determine whether provisioned
@@ -510,6 +506,10 @@ spec:
                        required:
                        - name
                        type: object
+                      region:
+                        description: Region is cloud provider's region. It will override
+                          the region in the region field of ProviderReference
+                        type: string
                      type:
                        default: hcl
                        description: Type specifies which Terraform configuration
--- a/charts/vela-core/templates/NOTES.txt
+++ b/charts/vela-core/templates/NOTES.txt
@@ -27,9 +27,3 @@ Welcome to use the KubeVela! Enjoy your shipping application journey!
      | . \| |_| || |_) ||  __/ \ V /|  __/| || (_| |
      |_|\_\\__,_||_.__/  \___|  \_/  \___||_| \__,_|

-** Please note before uninstalling **
-
-If you enable fluxcd addon when install the chart by set `enableFluxcdAddon=true` .
-Uninstall wouldn't disable the fluxcd addon ,and it will be kept in the cluster.
-Please guarantee there is no application in cluster using this addon and disable it firstly before uninstall the helm chart.
-And you can find the script of one-short disable all addons from the uninstalling section of https://github.com/oam-dev/kubevela/blob/master/charts/vela-core/README.md.
--- a/charts/vela-core/templates/_helpers.tpl
+++ b/charts/vela-core/templates/_helpers.tpl
@@ -66,14 +66,3 @@ Create the name of the service account to use
    {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
-
-{{/*
-systemDefinitionNamespace value defaulter
-*/}}
-{{- define "systemDefinitionNamespace" -}}
-{{- if .Values.systemDefinitionNamespace -}}
-    {{ .Values.systemDefinitionNamespace }}
-{{- else -}}
-    {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
--- a/charts/vela-core/templates/addon/fluxcd-def.yaml
+++ b/charts/vela-core/templates/addon/fluxcd-def.yaml
@@ -1,270 +0,0 @@
-{{- if .Values.enableFluxcdAddon -}}
-apiVersion: core.oam.dev/v1beta1
-kind: Application
-metadata:
-  labels:
-    addons.oam.dev/name: fluxcd-def
-  name: addon-fluxcd-def
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  components:
-    - name: fluxc-def-resources
-      properties:
-        objects:
-          - apiVersion: core.oam.dev/v1beta1
-            kind: ComponentDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: helm release is a group of K8s resources
-                  from either git repository or helm repo
-              name: helm
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "output: {\n\tapiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\tmetadata:
-                {\n\t\tname: context.name\n\t}\n\tif parameter.repoType == \"git\"
-                {\n\t\tkind: \"GitRepository\"\n\t\tspec: {\n\t\t\turl: parameter.url\n\t\t\tif
-                parameter.git.branch != _|_ {\n\t\t\t\tref: branch: parameter.git.branch\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
-                parameter.repoType == \"oss\" {\n\t\tkind: \"Bucket\"\n\t\tspec: {\n\t\t\tendpoint:
-                \  parameter.url\n\t\t\tbucketName: parameter.oss.bucketName\n\t\t\tprovider:
-                \  parameter.oss.provider\n\t\t\tif parameter.oss.region != _|_ {\n\t\t\t\tregion:
-                parameter.oss.region\n\t\t\t}\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n\tif
-                parameter.repoType == \"helm\" {\n\t\tkind: \"HelmRepository\"\n\t\tspec:
-                {\n\t\t\turl: parameter.url\n\t\t\t_secret\n\t\t\t_sourceCommonArgs\n\t\t}\n\t}\n}\n\noutputs:
-                release: {\n\tapiVersion: \"helm.toolkit.fluxcd.io/v2beta1\"\n\tkind:
-                \      \"HelmRelease\"\n\tmetadata: {\n\t\tname: context.name\n\t}\n\tspec:
-                {\n\t\ttimeout: parameter.installTimeout\n\t\tinterval: parameter.interval\n\t\tchart:
-                {\n\t\t\tspec: {\n\t\t\t\tchart:   parameter.chart\n\t\t\t\tversion:
-                parameter.version\n\t\t\t\tsourceRef: {\n\t\t\t\t\tif parameter.repoType
-                == \"git\" {\n\t\t\t\t\t\tkind: \"GitRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
-                parameter.repoType == \"helm\" {\n\t\t\t\t\t\tkind: \"HelmRepository\"\n\t\t\t\t\t}\n\t\t\t\t\tif
-                parameter.repoType == \"oss\" {\n\t\t\t\t\t\tkind: \"Bucket\"\n\t\t\t\t\t}\n\t\t\t\t\tname:
-                \     context.name\n\t\t\t\t}\n\t\t\t\tinterval: parameter.interval\n\t\t\t}\n\t\t}\n\t\tif
-                parameter.targetNamespace != _|_ {\n\t\t\ttargetNamespace: parameter.targetNamespace\n\t\t}\n\t\tif
-                parameter.releaseName != _|_ {\n\t\t\treleaseName: parameter.releaseName\n\t\t}\n\t\tif
-                parameter.values != _|_ {\n\t\t\tvalues: parameter.values\n\t\t}\n\t}\n}\n\n_secret:
-                {\n\tif parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname:
-                parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs: {\n\tinterval:
-                parameter.pullInterval\n\tif parameter.timeout != _|_ {\n\t\ttimeout:
-                parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType: *\"helm\" |
-                \"git\" | \"oss\"\n\t// +usage=The interval at which to check for
-                repository/bucket and relese updates, default to 5m\n\tpullInterval:
-                *\"5m\" | string\n        // +usage=The  Interval at which to reconcile
-                the Helm release, default to 30s\n        interval: *\"30s\" | string\n\t//
-                +usage=The Git or Helm repository URL, OSS endpoint, accept HTTP/S
-                or SSH address as git url,\n\turl: string\n\t// +usage=The name of
-                the secret containing authentication credentials\n\tsecretRef?: string\n\t//
-                +usage=The timeout for operations like download index/clone repository,
-                optional\n\ttimeout?: string\n\t// +usage=The timeout for operation
-                `helm install`, optional\n\tinstallTimeout: *\"10m\" | string\n\n\tgit?:
-                {\n\t\t// +usage=The Git reference to checkout and monitor for changes,
-                defaults to master branch\n\t\tbranch: string\n\t}\n\toss?: {\n\t\t//
-                +usage=The bucket's name, required if repoType is oss\n\t\tbucketName:
-                string\n\t\t// +usage=\"generic\" for Minio, Amazon S3, Google Cloud
-                Storage, Alibaba Cloud OSS, \"aws\" for retrieve credentials from
-                the EC2 service when credentials not specified, default \"generic\"\n\t\tprovider:
-                *\"generic\" | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
-                string\n\t}\n\n\t// +usage=1.The relative path to helm chart for git/oss
-                source. 2. chart name for helm resource 3. relative path for chart
-                package(e.g. ./charts/podinfo-1.2.3.tgz)\n\tchart: string\n\t// +usage=Chart
-                version\n\tversion: *\"*\" | string\n\t// +usage=The namespace for
-                helm chart, optional\n\ttargetNamespace?: string\n\t// +usage=The
-                release name\n\treleaseName?: string\n\t// +usage=Chart values\n\tvalues?:
-                #nestedmap\n}\n\n#nestedmap: {\n\t...\n}\n"
-              status:
-                customStatus: "repoMessage:    string\nreleaseMessage: string\nif context.output.status
-              == _|_ {\n\trepoMessage:    \"Fetching repository\"\n\treleaseMessage:
-              \"Wating repository ready\"\n}\nif context.output.status != _|_ {\n\trepoStatus:
-              context.output.status\n\tif repoStatus.conditions[0][\"type\"] != \"Ready\"
-              {\n\t\trepoMessage: \"Fetch repository fail\"\n\t}\n\tif repoStatus.conditions[0][\"type\"]
-              == \"Ready\" {\n\t\trepoMessage: \"Fetch repository successfully\"\n\t}\n\n\tif
-              context.outputs.release.status == _|_ {\n\t\treleaseMessage: \"Creating
-              helm release\"\n\t}\n\tif context.outputs.release.status != _|_ {\n\t\tif
-              context.outputs.release.status.conditions[0][\"message\"] == \"Release
-              reconciliation succeeded\" {\n\t\t\treleaseMessage: \"Create helm release
-              successfully\"\n\t\t}\n\t\tif context.outputs.release.status.conditions[0][\"message\"]
-              != \"Release reconciliation succeeded\" {\n\t\t\treleaseBasicMessage:
-              \"Delivery helm release in progress, message: \" + context.outputs.release.status.conditions[0][\"message\"]\n\t\t\tif
-              len(context.outputs.release.status.conditions) == 1 {\n\t\t\t\treleaseMessage:
-              releaseBasicMessage\n\t\t\t}\n\t\t\tif len(context.outputs.release.status.conditions)
-              > 1 {\n\t\t\t\treleaseMessage: releaseBasicMessage + \", \" + context.outputs.release.status.conditions[1][\"message\"]\n\t\t\t}\n\t\t}\n\t}\n\n}\nmessage:
-              repoMessage + \", \" + releaseMessage"
-                healthPolicy: 'isHealth: len(context.outputs.release.status.conditions)
-              != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
-              workload:
-                type: autodetects.core.oam.dev
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of JSON6902 patch to selected target
-              name: kustomize-json-patch
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
-                {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
-                +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
-                [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
-                | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
-                +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
-                source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
-                opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
-                +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
-                \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
-                \         string\n\tname?:               string\n\tannotationSelector?:
-                string\n\tlabelSelector?:      string\n}\n"
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of StrategicMerge or JSON6902 patch
-                  to selected target
-              name: kustomize-patch
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatches: parameter.patches\n\t}\n}\nparameter:
-                {\n\t// +usage=a list of StrategicMerge or JSON6902 patch to selected
-                target\n\tpatches: [...#patchItem]\n}\n\n// +usage=Contains a strategicMerge
-                or JSON6902 patch\n#patchItem: {\n\t// +usage=Inline patch string,
-                in yaml style\n\tpatch: string\n\t// +usage=Specify the target the
-                patch should be applied to\n\ttarget: #selector\n}\n\n// +usage=Selector
-                specifies a set of resources\n#selector: {\n\tgroup?:              string\n\tversion?:
-                \           string\n\tkind?:               string\n\tnamespace?:          string\n\tname?:
-                \              string\n\tannotationSelector?: string\n\tlabelSelector?:
-                \     string\n}\n"
-          - apiVersion: core.oam.dev/v1beta1
-            kind: ComponentDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: kustomize can fetching, building, updating
-                  and applying Kustomize manifests from git repo.
-              name: kustomize
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "output: {\n\tapiVersion: \"kustomize.toolkit.fluxcd.io/v1beta1\"\n\tkind:
-                \      \"Kustomization\"\n\tmetadata: {\n\t\tname: context.name\n
-                \   namespace: context.namespace\n\t}\n\tspec: {\n\t\tinterval: parameter.pullInterval\n\t\tsourceRef:
-                {\n\t\t\tif parameter.repoType == \"git\" {\n\t\t\t\tkind: \"GitRepository\"\n\t\t\t}\n\t\t\tif
-                parameter.repoType == \"oss\" {\n\t\t\t\tkind: \"Bucket\"\n\t\t\t}\n\t\t\tname:
-                \     context.name\n\t\t\tnamespace: context.namespace\n\t\t}\n\t\tpath:
-                \      parameter.path\n\t\tprune:      true\n\t\tvalidation: \"client\"\n\t}\n}\n\noutputs:
-                {\n  repo: {\n\t  apiVersion: \"source.toolkit.fluxcd.io/v1beta1\"\n\t
-                \ metadata: {\n\t\t  name: context.name\n      namespace: context.namespace\n\t
-                \ }\n\t  if parameter.repoType == \"git\" {\n\t\t  kind: \"GitRepository\"\n\t\t
-                \ spec: {\n\t\t\t  url: parameter.url\n\t\t\t  if parameter.git.branch
-                != _|_ {\n\t\t\t\t  ref: branch: parameter.git.branch\n\t\t\t  }\n
-                \       if parameter.git.provider != _|_ {\n          if parameter.git.provider
-                == \"GitHub\" {\n            gitImplementation: \"go-git\"\n          }\n
-                \         if parameter.git.provider == \"AzureDevOps\" {\n            gitImplementation:
-                \"libgit2\"\n          }\n        }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t
-                \ }\n\t  }\n\t  if parameter.repoType == \"oss\" {\n\t\t  kind: \"Bucket\"\n\t\t
-                \ spec: {\n\t\t\t  endpoint:   parameter.url\n\t\t\t  bucketName:
-                parameter.oss.bucketName\n\t\t\t  provider:   parameter.oss.provider\n\t\t\t
-                \ if parameter.oss.region != _|_ {\n\t\t\t\t  region: parameter.oss.region\n\t\t\t
-                \ }\n\t\t\t  _secret\n\t\t\t  _sourceCommonArgs\n\t\t  }\n\t  }\n
-                \ }\n\n  if parameter.imageRepository != _|_ {\n    imageRepo: {\n
-                \     apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n      kind:
-                \"ImageRepository\"\n\t    metadata: {\n\t\t    name: context.name\n
-                \       namespace: context.namespace\n\t    }\n      spec: {\n        image:
-                parameter.imageRepository.image\n        interval: parameter.pullInterval\n
-                \       if parameter.imageRepository.secretRef != _|_ {\n          secretRef:
-                name: parameter.imageRepository.secretRef\n        }\n      }\n    }\n\n
-                \   imagePolicy: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
-                \     kind: \"ImagePolicy\"\n\t    metadata: {\n\t\t    name: context.name\n
-                \       namespace: context.namespace\n\t    }\n      spec: {\n        imageRepositoryRef:
-                name: context.name\n        policy: parameter.imageRepository.policy\n
-                \       if parameter.imageRepository.filterTags != _|_ {\n          filterTags:
-                parameter.imageRepository.filterTags\n        }\n      }\n    }\n\n
-                \   imageUpdate: {\n      apiVersion: \"image.toolkit.fluxcd.io/v1beta1\"\n
-                \     kind: \"ImageUpdateAutomation\"\n\t    metadata: {\n\t\t    name:
-                context.name\n        namespace: context.namespace\n\t    }\n      spec:
-                {\n        interval: parameter.pullInterval\n        sourceRef: {\n
-                \         kind: \"GitRepository\"\n          name: context.name\n
-                \       }\n        git: {\n          checkout: ref: branch: parameter.git.branch\n
-                \         commit: {\n            author: {\n              email: \"kubevelabot@users.noreply.github.com\"\n
-                \             name: \"kubevelabot\"\n            }\n            if
-                parameter.imageRepository.commitMessage != _|_ {\n              messageTemplate:
-                \"Update image automatically.\\n\" + parameter.imageRepository.commitMessage\n
-                \           }\n            if parameter.imageRepository.commitMessage
-                == _|_ {\n              messageTemplate: \"Update image automatically.\"\n
-                \           }\n          }\n          push: branch: parameter.git.branch\n
-                \       }\n        update: {\n          path:\tparameter.path\n          strategy:
-                \"Setters\"\n        }\n      }\n    }\n  }\n}\n\n_secret: {\n\tif
-                parameter.secretRef != _|_ {\n\t\tsecretRef: {\n\t\t\tname: parameter.secretRef\n\t\t}\n\t}\n}\n\n_sourceCommonArgs:
-                {\n\tinterval: parameter.pullInterval\n\tif parameter.timeout != _|_
-                {\n\t\ttimeout: parameter.timeout\n\t}\n}\n\nparameter: {\n\trepoType:
-                *\"git\" | \"oss\"\n  // +usage=The image repository for automatically
-                update image to git\n  imageRepository?: {\n    // +usage=The image
-                url\n    image: string\n    // +usage=The name of the secret containing
-                authentication credentials\n    secretRef?: string\n    // +usage=Policy
-                gives the particulars of the policy to be followed in selecting the
-                most recent image.\n    policy: {\n      // +usage=Alphabetical set
-                of rules to use for alphabetical ordering of the tags.\n      alphabetical?:
-                {\n        // +usage=Order specifies the sorting order of the tags.\n
-                \       // +usage=Given the letters of the alphabet as tags, ascending
-                order would select Z, and descending order would select A.\n        order?:
-                \"asc\" | \"desc\"\n      }\n      // +usage=Numerical set of rules
-                to use for numerical ordering of the tags.\n      numerical?: {\n
-                \       // +usage=Order specifies the sorting order of the tags.\n
-                \       // +usage=Given the integer values from 0 to 9 as tags, ascending
-                order would select 9, and descending order would select 0.\n        order:
-                \"asc\" | \"desc\"\n      }\n      // +usage=SemVer gives a semantic
-                version range to check against the tags available.\n      semver?:
-                {\n        // +usage=Range gives a semver range for the image tag;
-                the highest version within the range that's a tag yields the latest
-                image.\n        range: string\n      }\n    }\n    // +usage=FilterTags
-                enables filtering for only a subset of tags based on a set of rules.
-                If no rules are provided, all the tags from the repository will be
-                ordered and compared.\n    filterTags?: {\n      // +usage=Extract
-                allows a capture group to be extracted from the specified regular
-                expression pattern, useful before tag evaluation.\n      extract?:
-                string\n      // +usage=Pattern specifies a regular expression pattern
-                used to filter for image tags.\n      pattern?: string\n    }\n    //
-                +usage=The image url\n    commitMessage?: string\n  }\n\t// +usage=The
-                interval at which to check for repository/bucket and release updates,
-                default to 5m\n\tpullInterval: *\"5m\" | string\n\t// +usage=The Git
-                or Helm repository URL, OSS endpoint, accept HTTP/S or SSH address
-                as git url,\n\turl: string\n\t// +usage=The name of the secret containing
-                authentication credentials\n\tsecretRef?: string\n\t// +usage=The
-                timeout for operations like download index/clone repository, optional\n\ttimeout?:
-                string\n\tgit?: {\n\t\t// +usage=The Git reference to checkout and
-                monitor for changes, defaults to master branch\n\t\tbranch: string\n
-                \   // +usage=Determines which git client library to use. Defaults
-                to GitHub, it will pick go-git. AzureDevOps will pick libgit2.\n    provider?:
-                *\"GitHub\" | \"AzureDevOps\"\n\t}\n\toss?: {\n\t\t// +usage=The bucket's
-                name, required if repoType is oss\n\t\tbucketName: string\n\t\t//
-                +usage=\"generic\" for Minio, Amazon S3, Google Cloud Storage, Alibaba
-                Cloud OSS, \"aws\" for retrieve credentials from the EC2 service when
-                credentials not specified, default \"generic\"\n\t\tprovider: *\"generic\"
-                | \"aws\"\n\t\t// +usage=The bucket region, optional\n\t\tregion?:
-                string\n\t}\n\t//+usage=Path to the directory containing the kustomization.yaml
-                file, or the set of plain YAMLs a kustomization.yaml should be generated
-                for.\n\tpath: string\n}"
-              workload:
-                type: autodetects.core.oam.dev
-          - apiVersion: core.oam.dev/v1beta1
-            kind: TraitDefinition
-            metadata:
-              annotations:
-                definition.oam.dev/description: A list of strategic merge to kustomize
-                  config
-              name: kustomize-strategy-merge
-              namespace: {{.Values.systemDefinitionNamespace}}
-            spec:
-              schematic:
-                cue:
-                  template: "patch: {\n\tspec: {\n\t\tpatchesStrategicMerge: parameter.patchesStrategicMerge\n\t}\n}\n\nparameter:
-                {\n\t// +usage=a list of strategicmerge, defined as inline yaml objects.\n\tpatchesStrategicMerge:
-                [...#nestedmap]\n}\n\n#nestedmap: {\n\t...\n}\n"
-      type: k8s-objects
-
-  {{- end }}
--- a/charts/vela-core/templates/addon/fluxcd.yaml
+++ b/charts/vela-core/templates/addon/fluxcd.yaml
--- a/charts/vela-core/templates/addon_registry.yaml
+++ b/charts/vela-core/templates/addon_registry.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: vela-addon-registry
-  namespace: {{ .Release.Namespace }}
+  namespace: vela-system
 data:
  registries: '{
  "KubeVela":{
@@ -13,4 +13,4 @@ data:
      "path": ""
    }
  }
-}'
+}'
--- a/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -39,10 +39,6 @@ spec:
            - --cert-name=tls.crt
      restartPolicy: OnFailure
      serviceAccountName: {{ template "kubevela.fullname" . }}-admission
-      {{- with .Values.admissionWebhooks.patch.nodeSelector }}
-      nodeSelector:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
      {{- with .Values.admissionWebhooks.patch.affinity }}
      affinity:
 {{ toYaml . | indent 8 }}
--- a/charts/vela-core/templates/definitions/autodetect.yaml
+++ b/charts/vela-core/templates/definitions/autodetect.yaml
@@ -4,7 +4,7 @@ metadata:
  annotations:
    definition.oam.dev/description: "autodetects.core.oam.dev is the default workload type of ComponentDefinition"
  name: autodetects.core.oam.dev
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  definitionRef:
    name: autodetects.core.oam.dev
--- a/charts/vela-core/templates/definitions/healthscopes.yaml
+++ b/charts/vela-core/templates/definitions/healthscopes.yaml
@@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: ScopeDefinition
 metadata:
  name: healthscopes.core.oam.dev
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  workloadRefsPath: spec.workloadRefs
  allowComponentOverlap: true
--- a/charts/vela-core/templates/defwithtemplate/annotations.yaml
+++ b/charts/vela-core/templates/defwithtemplate/annotations.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: annotations
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/apply-application-in-parallel.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-application-in-parallel.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: apply-application-in-parallel
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/apply-application.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-application.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: apply-application
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/apply-object.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-object.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: apply-object
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/apply-remaining.yaml
+++ b/charts/vela-core/templates/defwithtemplate/apply-remaining.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: apply-remaining
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/command.yaml
+++ b/charts/vela-core/templates/defwithtemplate/command.yaml
@@ -1,114 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/command.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Add command on K8s pod for your workload which follows the pod spec in path 'spec.template'
-  labels:
-    custom.definition.oam.dev/ui-hidden: "true"
-  name: command
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - '*'
-  schematic:
-    cue:
-      template: |
-        #PatchParams: {
-        	// +usage=Specify the name of the target container, if not set, use the component name
-        	containerName: *"" | string
-        	// +usage=Specify the command to use in the target container, if not set, it will not be changed
-        	command: *null | [...string]
-        	// +usage=Specify the args to use in the target container, if set, it will override existing args
-        	args: *null | [...string]
-        	// +usage=Specify the args to add in the target container, existing args will be kept, cannot be used with `args`
-        	addArgs: *null | [...string]
-        	// +usage=Specify the existing args to delete in the target container, cannot be used with `args`
-        	delArgs: *null | [...string]
-        }
-        PatchContainer: {
-        	_params:         #PatchParams
-        	name:            _params.containerName
-        	_baseContainers: context.output.spec.template.spec.containers
-        	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
-        	_baseContainer: *_|_ | {...}
-        	if len(_matchContainers_) == 0 {
-        		err: "container \(name) not found"
-        	}
-        	if len(_matchContainers_) > 0 {
-        		_baseContainer: _matchContainers_[0]
-        		if _params.command != null {
-        			// +patchStrategy=replace
-        			command: _params.command
-        		}
-        		if (_params.addArgs != null || _params.delArgs != null) && _params.args != null {
-        			err: "cannot set addArgs/delArgs and args at the same time"
-        		}
-        		_delArgs: {...}
-        		if _params.delArgs != null {
-        			_delArgs: {for k in _params.delArgs {"\(k)": ""}}
-        		}
-        		if _params.delArgs == null {
-        			_delArgs: {}
-        		}
-        		_args: [...string]
-        		if _params.args != null {
-        			_args: _params.args
-        		}
-        		if _params.args == null && _baseContainer.args != _|_ {
-        			_args: _baseContainer.args
-        		}
-        		if _params.args == null && _baseContainer.args == _|_ {
-        			_args: []
-        		}
-        		_argsMap: {for a in _args {"\(a)": ""}}
-        		_addArgs: [...string]
-        		if _params.addArgs != null {
-        			_addArgs: _params.addArgs
-        		}
-        		if _params.addArgs == null {
-        			_addArgs: []
-        		}
-
-        		// +patchStrategy=replace
-        		args: [ for a in _args if _delArgs[a] == _|_ {a}] + [ for a in _addArgs if _delArgs[a] == _|_ && _argsMap[a] == _|_ {a}]
-        	}
-        }
-        // +patchStrategy=open
-        patch: spec: template: spec: {
-        	if parameter.containers == _|_ {
-        		// +patchKey=name
-        		containers: [{
-        			PatchContainer & {_params: {
-        				if parameter.containerName == "" {
-        					containerName: context.name
-        				}
-        				if parameter.containerName != "" {
-        					containerName: parameter.containerName
-        				}
-        				command: parameter.command
-        				args:    parameter.args
-        				addArgs: parameter.addArgs
-        				delArgs: parameter.delArgs
-        			}}
-        		}]
-        	}
-        	if parameter.containers != _|_ {
-        		// +patchKey=name
-        		containers: [ for c in parameter.containers {
-        			if c.containerName == "" {
-        				err: "container name must be set for containers"
-        			}
-        			if c.containerName != "" {
-        				PatchContainer & {_params: c}
-        			}
-        		}]
-        	}
-        }
-        parameter: #PatchParams | close({
-        	// +usage=Specify the commands for multiple containers
-        	containers: [...#PatchParams]
-        })
-        errs: [ for c in patch.spec.template.spec.containers if c.err != _|_ {c.err}]
-
--- a/charts/vela-core/templates/defwithtemplate/configmap.yaml
+++ b/charts/vela-core/templates/defwithtemplate/configmap.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/deprecated: "true"
  name: configmap
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/container-image.yaml
+++ b/charts/vela-core/templates/defwithtemplate/container-image.yaml
@@ -1,77 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/container-image.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Set the image of the container.
-  name: container-image
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - '*'
-  podDisruptive: true
-  schematic:
-    cue:
-      template: |
-        #PatchParams: {
-        	// +usage=Specify the name of the target container, if not set, use the component name
-        	containerName: *"" | string
-        	// +usage=Specify the image of the container
-        	image: string
-        	// +usage=Specify the image pull policy of the container
-        	imagePullPolicy: *"" | "IfNotPresent" | "Always" | "Never"
-        }
-        PatchContainer: {
-        	_params:         #PatchParams
-        	name:            _params.containerName
-        	_baseContainers: context.output.spec.template.spec.containers
-        	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
-        	_baseContainer: *_|_ | {...}
-        	if len(_matchContainers_) == 0 {
-        		err: "container \(name) not found"
-        	}
-        	if len(_matchContainers_) > 0 {
-        		// +patchStrategy=retainKeys
-        		image: _params.image
-
-        		if _params.imagePullPolicy != "" {
-        			// +patchStrategy=retainKeys
-        			imagePullPolicy: _params.imagePullPolicy
-        		}
-        	}
-        }
-        patch: spec: template: spec: {
-        	if parameter.containers == _|_ {
-        		// +patchKey=name
-        		containers: [{
-        			PatchContainer & {_params: {
-        				if parameter.containerName == "" {
-        					containerName: context.name
-        				}
-        				if parameter.containerName != "" {
-        					containerName: parameter.containerName
-        				}
-        				image:           parameter.image
-        				imagePullPolicy: parameter.imagePullPolicy
-        			}}
-        		}]
-        	}
-        	if parameter.containers != _|_ {
-        		// +patchKey=name
-        		containers: [ for c in parameter.containers {
-        			if c.containerName == "" {
-        				err: "containerName must be set for containers"
-        			}
-        			if c.containerName != "" {
-        				PatchContainer & {_params: c}
-        			}
-        		}]
-        	}
-        }
-        parameter: #PatchParams | close({
-        	// +usage=Specify the container image for multiple containers
-        	containers: [...#PatchParams]
-        })
-        errs: [ for c in patch.spec.template.spec.containers if c.err != _|_ {c.err}]
-
--- a/charts/vela-core/templates/defwithtemplate/cpuscaler.yaml
+++ b/charts/vela-core/templates/defwithtemplate/cpuscaler.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: cpuscaler
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - deployments.apps
--- a/charts/vela-core/templates/defwithtemplate/depends-on-app.yaml
+++ b/charts/vela-core/templates/defwithtemplate/depends-on-app.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: depends-on-app
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/deploy-cloud-resource.yaml
+++ b/charts/vela-core/templates/defwithtemplate/deploy-cloud-resource.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: Deploy cloud resource and bind secret to clusters
  name: deploy-cloud-resource
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/deploy.yaml
+++ b/charts/vela-core/templates/defwithtemplate/deploy.yaml
@@ -1,59 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/deploy.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Deploy components with policies.
-  name: deploy
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        deploy: op.#Steps & {
-        	load: op.#Load @step(1)
-        	_components: [ for k, v in load.value {v}]
-        	loadPoliciesInOrder: op.#LoadPoliciesInOrder & {
-        		if parameter.policies != _|_ {
-        					input: parameter.policies
-        				}
-        	}                     @step(2)
-        	_policies:            loadPoliciesInOrder.output
-        	handleDeployPolicies: op.#HandleDeployPolicies & {
-        		inputs: {
-        			components: _components
-        			policies:   _policies
-        		}
-        	}                   @step(3)
-        	_decisions:         handleDeployPolicies.outputs.decisions
-        	_patchedComponents: handleDeployPolicies.outputs.components
-        	deploy:             op.#ApplyComponents & {
-        		parallelism: parameter.parallelism
-        		components: {
-        			for decision in _decisions {
-        				for key, comp in _patchedComponents {
-        					"\(decision.cluster)-\(decision.namespace)-\(key)": {
-        						value: comp
-        						if decision.cluster != _|_ {
-        							cluster: decision.cluster
-        						}
-        						if decision.namespace != _|_ {
-        							namespace: decision.namespace
-        						}
-        					}
-        				}
-        			}
-        		}
-        	} @step(4)
-        }
-        parameter: {
-        	auto: *true | bool
-        	policies?: [...string]
-        	parallelism: *5 | int
-        }
-
--- a/charts/vela-core/templates/defwithtemplate/deploy2env.yaml
+++ b/charts/vela-core/templates/defwithtemplate/deploy2env.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: Deploy env binding component to target env
  name: deploy2env
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/deploy2runtime.yaml
+++ b/charts/vela-core/templates/defwithtemplate/deploy2runtime.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: deploy2runtime
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/env-binding.yaml
+++ b/charts/vela-core/templates/defwithtemplate/env-binding.yaml
@@ -0,0 +1,62 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/env-binding.cue
+apiVersion: core.oam.dev/v1beta1
+kind: PolicyDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Provides differentiated configuration and environment scheduling policies for application.
+  name: env-binding
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        output: {
+        	apiVersion: "core.oam.dev/v1alpha1"
+        	kind:       "EnvBinding"
+        	spec: {
+        		engine: parameter.clusterManagementEngine
+        		appTemplate: {
+        			apiVersion: "core.oam.dev/v1beta1"
+        			kind:       "Application"
+        			metadata: {
+        				name:      context.appName
+        				namespace: context.namespace
+        			}
+        			spec: components: context.components
+        		}
+        		envs: parameter.envs
+        		outputResourcesTo: {
+        			name:      context.name
+        			namespace: context.namespace
+        		}
+        	}
+        }
+        #Env: {
+        	name: string
+        	patch: components: [...{
+        		name: string
+        		type: string
+        		properties: {...}
+        		traits?: [...{
+        			type: string
+        			properties: {...}
+        		}]
+        	}]
+        	placement: {
+        		clusterSelector?: {
+        			labels?: [string]: string
+        			name?: string
+        		}
+        		namespaceSelector?: {
+        			labels?: [string]: string
+        			name?: string
+        		}
+        	}
+        	selector?: components: [...string]
+        }
+        parameter: {
+        	clusterManagementEngine: *"cluster-gateway" | string
+        	envs: [...#Env]
+        }
+
--- a/charts/vela-core/templates/defwithtemplate/env.yaml
+++ b/charts/vela-core/templates/defwithtemplate/env.yaml
@@ -8,93 +8,25 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: env
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
  schematic:
    cue:
      template: |
-        #PatchParams: {
-        	// +usage=Specify the name of the target container, if not set, use the component name
-        	containerName: *"" | string
-        	// +usage=Specify if replacing the whole environment settings for the container
-        	replace: *false | bool
-        	// +usage=Specify the  environment variables to merge, if key already existing, override its value
-        	env: [string]: string
-        	// +usage=Specify which existing environment variables to unset
-        	unset: *[] | [...string]
-        }
-        PatchContainer: {
-        	_params: #PatchParams
-        	name:    _params.containerName
-        	_delKeys: {for k in _params.unset {"\(k)": ""}}
-        	_baseContainers: context.output.spec.template.spec.containers
-        	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
-        	_baseContainer: *_|_ | {...}
-        	if len(_matchContainers_) == 0 {
-        		err: "container \(name) not found"
-        	}
-        	if len(_matchContainers_) > 0 {
-        		_baseContainer: _matchContainers_[0]
-        		_baseEnv:       _baseContainer.env
-        		if _baseEnv == _|_ {
-        			// +patchStrategy=replace
-        			env: [ for k, v in _params.env if _delKeys[k] == _|_ {
-        				name:  k
-        				value: v
-        			}]
-        		}
-        		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar.value}}
-        			// +patchStrategy=replace
-        			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
-        				name: envVar.name
-        				if _params.env[envVar.name] != _|_ {
-        					value: _params.env[envVar.name]
-        				}
-        				if _params.env[envVar.name] == _|_ {
-        					value: envVar.value
-        				}
-        			}] + [ for k, v in _params.env if _delKeys[k] == _|_ && (_params.replace || _baseEnvMap[k] == _|_) {
-        				name:  k
-        				value: v
-        			}]
-        		}
-        	}
-        }
        patch: spec: template: spec: {
-        	if parameter.containers == _|_ {
-        		// +patchKey=name
-        		containers: [{
-        			PatchContainer & {_params: {
-        				if parameter.containerName == "" {
-        					containerName: context.name
-        				}
-        				if parameter.containerName != "" {
-        					containerName: parameter.containerName
-        				}
-        				replace: parameter.replace
-        				env:     parameter.env
-        				unset:   parameter.unset
-        			}}
-        		}]
-        	}
-        	if parameter.containers != _|_ {
-        		// +patchKey=name
-        		containers: [ for c in parameter.containers {
-        			if c.containerName == "" {
-        				err: "containerName must be set for containers"
-        			}
-        			if c.containerName != "" {
-        				PatchContainer & {_params: c}
-        			}
-        		}]
-        	}
+        	// +patchKey=name
+        	containers: [{
+        		name: context.name
+        		// +patchStrategy=retainKeys
+        		env: [
+        			for k, v in parameter.env {
+        				name:  k
+        				value: v
+        			},
+        		]
+        	}]
        }
-        parameter: #PatchParams | close({
-        	// +usage=Specify the environment variables for multiple containers
-        	containers: [...#PatchParams]
-        })
-        errs: [ for c in patch.spec.template.spec.containers if c.err != _|_ {c.err}]
+        parameter: env: [string]: string

--- a/charts/vela-core/templates/defwithtemplate/export2config.yaml
+++ b/charts/vela-core/templates/defwithtemplate/export2config.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: export2config
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/export2secret.yaml
+++ b/charts/vela-core/templates/defwithtemplate/export2secret.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: export2secret
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/expose.yaml
+++ b/charts/vela-core/templates/defwithtemplate/expose.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: expose
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  podDisruptive: false
  schematic:
--- a/charts/vela-core/templates/defwithtemplate/gateway.yaml
+++ b/charts/vela-core/templates/defwithtemplate/gateway.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: Enable public web traffic for the component, the ingress API matches K8s v1.20+.
  name: gateway
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  podDisruptive: false
  schematic:
--- a/charts/vela-core/templates/defwithtemplate/health.yaml
+++ b/charts/vela-core/templates/defwithtemplate/health.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: Apply periodical health checking to the application.
  name: health
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  manageHealthCheck: true
  schematic:
--- a/charts/vela-core/templates/defwithtemplate/hostalias.yaml
+++ b/charts/vela-core/templates/defwithtemplate/hostalias.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: hostalias
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml
+++ b/charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: import-grafana-dashboard
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads: []
  conflictsWith: []
--- a/charts/vela-core/templates/defwithtemplate/ingress-1-20.yaml
+++ b/charts/vela-core/templates/defwithtemplate/ingress-1-20.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/deprecated: "true"
  name: ingress-1-20
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  podDisruptive: false
  schematic:
--- a/charts/vela-core/templates/defwithtemplate/ingress.yaml
+++ b/charts/vela-core/templates/defwithtemplate/ingress.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/deprecated: "true"
  name: ingress
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  podDisruptive: false
  schematic:
--- a/charts/vela-core/templates/defwithtemplate/init-container.yaml
+++ b/charts/vela-core/templates/defwithtemplate/init-container.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: init-container
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - deployments.apps
--- a/charts/vela-core/templates/defwithtemplate/json-merge-patch.yaml
+++ b/charts/vela-core/templates/defwithtemplate/json-merge-patch.yaml
@@ -1,20 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/json-merge-patch.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Patch the output following Json Merge Patch strategy, following RFC 7396.
-  name: json-merge-patch
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - '*'
-  podDisruptive: true
-  schematic:
-    cue:
-      template: |
-        parameter: {...}
-        // +patchStrategy=jsonMergePatch
-        patch: parameter
-
--- a/charts/vela-core/templates/defwithtemplate/json-patch.yaml
+++ b/charts/vela-core/templates/defwithtemplate/json-patch.yaml
@@ -1,20 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/json-patch.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Patch the output following Json Patch strategy, following RFC 6902.
-  name: json-patch
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - '*'
-  podDisruptive: true
-  schematic:
-    cue:
-      template: |
-        parameter: operations: [...{...}]
-        // +patchStrategy=jsonPatch
-        patch: parameter
-
--- a/charts/vela-core/templates/defwithtemplate/k8s-objects.yaml
+++ b/charts/vela-core/templates/defwithtemplate/k8s-objects.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: K8s-objects allow users to specify raw K8s objects in properties
  name: k8s-objects
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/labels.yaml
+++ b/charts/vela-core/templates/defwithtemplate/labels.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: labels
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/lifecycle.yaml
+++ b/charts/vela-core/templates/defwithtemplate/lifecycle.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: lifecycle
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/nocalhost.yaml
+++ b/charts/vela-core/templates/defwithtemplate/nocalhost.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: nocalhost
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/node-affinity.yaml
+++ b/charts/vela-core/templates/defwithtemplate/node-affinity.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: node-affinity
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/charts/vela-core/templates/defwithtemplate/notification.yaml
+++ b/charts/vela-core/templates/defwithtemplate/notification.yaml
@@ -6,7 +6,7 @@ metadata:
  annotations:
    definition.oam.dev/description: Send message to webhook
  name: notification
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/pure-ingress.yaml
+++ b/charts/vela-core/templates/defwithtemplate/pure-ingress.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: pure-ingress
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads: []
  conflictsWith: []
--- a/charts/vela-core/templates/defwithtemplate/pvc.yaml
+++ b/charts/vela-core/templates/defwithtemplate/pvc.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/deprecated: "true"
  name: pvc
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - deployments.apps
--- a/charts/vela-core/templates/defwithtemplate/raw.yaml
+++ b/charts/vela-core/templates/defwithtemplate/raw.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/deprecated: "true"
  name: raw
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/read-object.yaml
+++ b/charts/vela-core/templates/defwithtemplate/read-object.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: read-object
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  schematic:
    cue:
--- a/charts/vela-core/templates/defwithtemplate/ref-objects.yaml
+++ b/charts/vela-core/templates/defwithtemplate/ref-objects.yaml
@@ -1,34 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/ref-objects.cue
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Ref-objects allow users to specify ref objects to use. Notice that this component type have special handle logic.
-  name: ref-objects
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #K8sObject: {
-        	apiVersion: string
-        	kind:       string
-        	metadata: {
-        		name: string
-        		...
-        	}
-        	...
-        }
-        output: parameter.objects[0]
-        outputs: {
-        	for i, v in parameter.objects {
-        		if i > 0 {
-        			"objects-\(i)": v
-        		}
-        	}
-        }
-        parameter: objects: [...#K8sObject]
-  workload:
-    type: autodetects.core.oam.dev
-
--- a/charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml
+++ b/charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: register-grafana-datasource
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads: []
  conflictsWith: []
--- a/charts/vela-core/templates/defwithtemplate/resource.yaml
+++ b/charts/vela-core/templates/defwithtemplate/resource.yaml
@@ -8,7 +8,7 @@ metadata:
  labels:
    custom.definition.oam.dev/ui-hidden: "true"
  name: resource
-  namespace: {{ include "systemDefinitionNamespace" . }}
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
  appliesToWorkloads:
    - '*'
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	29ecc5c0df	Feat: support vela show for workflow step definition (#3161 ) Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `23852b3d10`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2022-01-25 15:05:46 +08:00
github-actions[bot]	20c11f2b84	fix: vela addnon enable cannot support = (#3158 ) Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `ddefb8cb4e`) Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>	2022-01-25 13:58:24 +08:00
github-actions[bot]	e9f7cf7c23	Fix: add context parameters into the error message (#3159 ) Signed-off-by: zeed-w-beez <zeed.w.zhao@gmail.com> (cherry picked from commit `170888063d`) Co-authored-by: zeed-w-beez <zeed.w.zhao@gmail.com>	2022-01-25 13:28:01 +08:00
github-actions[bot]	cebeff867a	[Backport release-1.2] Feat: addon parameter support ui-shcema (#3155 ) * Feat: addon parameter support ui-shcema Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> fix ci (cherry picked from commit `8e2bf9c68d`) * add more tests Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com> (cherry picked from commit `661d9f7a47`) Co-authored-by: 楚岳 <wangyike.wyk@alibaba-inc.com>	2022-01-25 10:47:07 +08:00
github-actions[bot]	7902a19aae	[Backport release-1.2] Fix: retrieve Terraform variables from variables.tf (#3153 ) * Fix: retrieve Terraform variables from variables.tf If Terraform modules/resources are stored in remote git repos, get variables from file `varialbes.tf`, or from `main.tf`. Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `b257825af6`) * set the required field per the variables' property Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `4b151582c5`) * fix ut issue Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `b52145c8a4`) * fix ut issue Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `410acc8ae2`) Co-authored-by: Zheng Xi Zhou <zzxwill@gmail.com>	2022-01-24 13:56:59 +08:00
github-actions[bot]	f98b8c7d8a	Fix: add providerRef in generated ComponentDefinition (#3151 ) If the provider is not provider, append the providerRef section in the generated ComponentDefinition Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `34ecc40aad`) Co-authored-by: Zheng Xi Zhou <zzxwill@gmail.com>	2022-01-24 11:00:41 +08:00
github-actions[bot]	ee8773e1cf	[Backport release-1.2] Fix: handle workflow cache reconcile (#3148 ) * Fix: handle workflow cache reconcile Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `12df87ac11`) * fix return and move backoff to memory Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `ee876f53c3`) * handle failed to patch case Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `eac4a1b370`) * add store in err case Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `32825c5c41`) * make reviewable Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `02b9c60922`) * fix ut Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `bff156cbe6`) * do cleanup in ut Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `463bd96e78`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2022-01-24 10:37:48 +08:00
github-actions[bot]	8cf2f20846	[Backport release-1.2] Fix: workflow skip executing all steps occasionally (#3147 ) * fix asi Signed-off-by: Jian.Li <lj176172@alibaba-inc.com> (cherry picked from commit `2c26caedd3`) * fix lint Signed-off-by: Jian.Li <lj176172@alibaba-inc.com> (cherry picked from commit `b63e892eb3`) * add trace tag (cherry picked from commit `1a6d79642e`) * add args for this feature Signed-off-by: Jian.Li <lj176172@alibaba-inc.com> (cherry picked from commit `b9181b9fc0`) * enable-asi-compatibility Signed-off-by: Jian.Li <lj176172@alibaba-inc.com> (cherry picked from commit `5d013db0bd`) Co-authored-by: Jian.Li <lj176172@alibaba-inc.com>	2022-01-23 10:13:59 +08:00
github-actions[bot]	2c6e8e7de7	[Backport release-1.2] Feat: extend gateway trait to set class in spec (#3146 ) * Feat: extend gateway trait to set class in spec `kubernetes.io/ingress.class` annotation is deprecated in favor of `.spec.ingressClassName`. However, there is no way to set it through the gateway trait for now. This commit extends the gateway trait by adding `classInSpec` to parameter. Forcing the use of `.spec.ingressClassName` makes sense, but some ingress controllers (including old versions) may not recognize this field. Therefore, set default value of `classInSpec` to `false` for backward compatibility. Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit `ad8bd1c1c4`) * Chore: update classInSpec usage Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit `721f879e3d`) Co-authored-by: Sunghoon Kang <hoon@linecorp.com>	2022-01-23 10:13:18 +08:00
github-actions[bot]	dbfd6a1d10	[Backport release-1.2] Fix: prioritize namespace flag for `vela up` (#3137 ) * Fix: prioritize namespace flag for `vela up` Currently, CLI applies application to `default` namespace when there is no explicit namespace in application spec, even if the namespace flag is set. This commit fixes issue by overriding the namespace if the namespace flag is set. Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit `4cf07dcd97`) * Test: add test cases for overriding namespaces Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit `5ba93541e4`) Co-authored-by: Sunghoon Kang <hoon@linecorp.com>	2022-01-21 11:27:11 +08:00
github-actions[bot]	ce8e652802	Fix: support generate Terraform ComponentDefinition from local HCL file (#3134 ) Besides generating a Terraform ComponentDefinition from a remote git repo, support generate one from local HCL file Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `bc06a5343e`) Co-authored-by: Zheng Xi Zhou <zzxwill@gmail.com>	2022-01-20 14:59:24 +08:00
github-actions[bot]	9968211163	add imagePullSecrets for helm templates to support private docker registry (#3129 ) Signed-off-by: StevenLeiZhang <zhangleiic@163.com> (cherry picked from commit `cf9eb0ded9`) Co-authored-by: StevenLeiZhang <zhangleiic@163.com>	2022-01-19 13:00:45 +08:00
github-actions[bot]	c86776cca1	[Backport release-1.2] Feat: add port name in webservice (#3120 ) * Feat: add port name in webservice Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `76789b0222`) * fix port name in container Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `b486a7c74d`) * generate port name if not specified Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> (cherry picked from commit `4eec002916`) Co-authored-by: FogDong <dongtianxin.tx@alibaba-inc.com>	2022-01-18 19:43:18 +08:00
github-actions[bot]	11a1b2fa72	Fix: add app samples for Terraform definition (#3119 ) Added application samples for all Terraform typed ComponentDefinition, and also localize the title for AWS and AZure Signed-off-by: Zheng Xi Zhou <zzxwill@gmail.com> (cherry picked from commit `670a327161`) Co-authored-by: Zheng Xi Zhou <zzxwill@gmail.com>	2022-01-18 18:10:16 +08:00
github-actions[bot]	cd036b87ae	Feat: support wild match for env patch (#3116 ) Signed-off-by: Somefive <yd219913@alibaba-inc.com> (cherry picked from commit `fe0d33c6d9`) Co-authored-by: Somefive <yd219913@alibaba-inc.com>	2022-01-18 18:07:05 +08:00
github-actions[bot]	7e447c6532	fix revision will change when add new trait with skiprevisionaffect to application (#3117 ) Signed-off-by: chwetion <chwetion@foxmail.com> (cherry picked from commit `86f6fef216`) Co-authored-by: chwetion <chwetion@foxmail.com>	2022-01-18 13:41:48 +08:00
github-actions[bot]	b836f86484	Fix: trait/comp command output without a new line (#3115 ) Signed-off-by: qiaozp <chivalry.pp@gmail.com> (cherry picked from commit `1ba3e1dd62`) Co-authored-by: qiaozp <chivalry.pp@gmail.com>	2022-01-18 13:05:23 +08:00
github-actions[bot]	d34372bf47	[Backport release-1.2] Feat: add JFrog webhook trigger (#3114 ) * add jfrog webhook to update application image Signed-off-by: chwetion <chwetion@foxmail.com> (cherry picked from commit `962fce6870`) * edit jfrog default request header Signed-off-by: chwetion <chwetion@foxmail.com> (cherry picked from commit `a977bfc9af`) Co-authored-by: chwetion <chwetion@foxmail.com>	2022-01-18 11:51:15 +08:00