Fix: stores workflow status in revison if it is restarted (#5604) (#5672)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # This file is a github code protect rule follow the codeowners https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
 
-*                                  @barnettZQG @wonderflow @leejanee @Somefive @jefree-cat @FogDong
-design/                            @barnettZQG @leejanee @wonderflow @Somefive @jefree-cat @FogDong
+*                                  @barnettZQG @wonderflow @leejanee @Somefive @jefree-cat
+design/                            @barnettZQG @leejanee @wonderflow @Somefive @jefree-cat
 
 # Owner of Core Controllers
 pkg/controller/core.oam.dev       @Somefive @FogDong @barnettZQG @wonderflow
@@ -21,7 +21,7 @@ pkg/controller/common/rollout/     @wangyikewxgm @wonderflow
 runtime/rollout                    @wangyikewxgm @wonderflow
 
 # Owner of vela templates
-vela-templates/                     @Somefive @barnettZQG @wonderflow @FogDong
+vela-templates/                     @Somefive @barnettZQG @wonderflow
 
 # Owner of vela CLI
 references/cli/                     @Somefive @zzxwill @StevenLeiZhang @charlie0129 @chivalryq

.github/bot.md

@@ -1,6 +1,6 @@
 ### GitHub & kubevela automation
 
-The bot is configured via [issue-commands.json](https://github.com/kubevela/kubevela/blob/master/.github/issue-commands.json) 
+The bot is configured via [issue-commands.json](https://github.com/kubevela/kubevela/blob/master/.github/workflows/issue-commands.json) 
 and some other GitHub [workflows](https://github.com/kubevela/kubevela/blob/master/.github/workflows).
 By default, users with write access to the repo is allowed to use the comments, 
 the [userlist](https://github.com/kubevela/kubevela/blob/master/.github/comment.userlist) 

.github/workflows/apiserver-test.yaml

@@ -18,9 +18,9 @@ on:
 env:
   # Common versions
   GO_VERSION: '1.19'
-
-permissions:
-  contents: read
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -31,12 +31,26 @@ jobs:
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
+
+  set-k8s-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
+    steps:
+      - id: set-k8s-matrix
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            echo "pushing tag: ${{ github.ref_name }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+          else
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+          fi
 
   apiserver-unit-tests:
     runs-on: ubuntu-20.04
@@ -45,18 +59,18 @@ jobs:
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v1
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
       - name: Cache Go Dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+        uses: actions/cache@v2
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -69,13 +83,12 @@ jobs:
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@538a4d2a1041920c47630172445cb688592d6e51 # 1.8.0
+        uses: supercharge/mongodb-github-action@1.7.0
         with:
           mongodb-version: '5.0'
 
-        # TODO need update action version to resolve node 12 deprecated.
       - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@ff52bff1bae252239223476e5ab0d71d6ba02343
+        uses: RyanSiu1995/kubebuilder-action@v1.2
         with:
           version: 3.1.0
           kubebuilderOnly: false
@@ -85,7 +98,7 @@ jobs:
         run: make unit-test-apiserver
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt
@@ -94,24 +107,24 @@ jobs:
 
   apiserver-e2e-tests:
     runs-on: aliyun
-    needs: [ detect-noop ]
+    needs: [ detect-noop,set-k8s-matrix ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
       matrix:
-        k8s-version: ["v1.20","v1.24"]
+        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
       cancel-in-progress: true
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v1
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
@@ -133,7 +146,7 @@ jobs:
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
 
       - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -141,7 +154,7 @@ jobs:
 
 
       - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -165,7 +178,7 @@ jobs:
           make e2e-cleanup
           make e2e-setup-core
           bin/vela addon enable fluxcd
-          bin/vela addon enable vela-workflow --override-definitions
+          bin/vela addon enable vela-workflow
           timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
           kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
           kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
@@ -183,10 +196,10 @@ jobs:
         run: make end-e2e-core
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: /tmp/e2e-profile.out, /tmp/e2e_apiserver_test.out
+          files: /tmp/e2e_apiserver_test.out
           flags: apiserver-e2etests
           name: codecov-umbrella
 
@@ -195,4 +208,4 @@ jobs:
 
       - name: Cleanup image
         if: ${{ always() }}
-        run: make image-cleanup
+        run: make image-cleanup

.github/workflows/back-port.yaml

@@ -4,25 +4,19 @@ on:
     types:
       - closed
 
-permissions:
-  contents: read
-
 jobs:
   # align with crossplane's choice https://github.com/crossplane/crossplane/blob/master/.github/workflows/backport.yml
   open-pr:
     runs-on: ubuntu-20.04
     if: github.event.pull_request.merged
-    permissions:
-      contents: write
-      pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@2ee900dc92632adf994f8e437b6d16840fd61f58
+        uses: zeebe-io/backport-action@v0.0.6
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/chart.yaml

@@ -6,9 +6,6 @@ on:
       - "v*"
   workflow_dispatch: { }
 
-permissions:
-  contents: read
-
 env:
   BUCKET: ${{ secrets.OSS_BUCKET }}
   ENDPOINT: ${{ secrets.OSS_ENDPOINT }}
@@ -31,18 +28,18 @@ jobs:
       VELA_ROLLOUT_HELM_CHART_NAME: vela-rollout
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - uses: actions/checkout@master
       - name: Get git revision
         id: vars
         shell: bash
         run: |
-          echo "git_revision=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
       - name: Install Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@v1
         with:
           version: v3.4.0
       - name: Setup node
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
+        uses: actions/setup-node@v2
         with:
           node-version: '14'
       - name: Generate helm doc
@@ -59,7 +56,7 @@ jobs:
         id: get_version
         run: |
           VERSION=${GITHUB_REF#refs/tags/}
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          echo ::set-output name=VERSION::${VERSION}
       - name: Tag helm chart image
         run: |
           image_tag=${{ steps.get_version.outputs.VERSION }}

.github/workflows/codeql-analysis.yml

@@ -4,34 +4,27 @@ on:
   push:
     branches: [ master, release-* ]
 
-permissions:
-  contents: read
-
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
 
-    permissions:
-      actions: read  # for github/codeql-action/init to get workflow details
-      security-events: write  # for github/codeql-action/autobuild to send a status report
-
     strategy:
       fail-fast: false
       matrix:
         language: [ 'go' ]
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
-        with:
-          languages: ${{ matrix.language }}
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
 
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/commit-lint.yml

@@ -8,14 +8,11 @@ on:
       - labeled
       - unlabeled
 
-permissions:
-  pull-requests: read
-
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/pr-title-checker@v1.3.5
+      - uses: thehanimo/pr-title-checker@v1.3.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           pass_on_octokit_error: true

.github/workflows/core-api-test.yml

@@ -1,40 +0,0 @@
-name: core-api-test
-on:
-  pull_request:
-    paths:
-      - 'apis/**'
-      - 'pkg/oam/**'
-      - "hack/apis/**"
-    branches:
-      - master
-      - release-*
-
-permissions:
-  contents: read
-
-jobs:
-  core-api-test:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
-        env:
-          GO_VERSION: '1.19'
-        with:
-          go-version: ${{ env.GO_VERSION }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-
-      - name: Get the version
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-
-      - name: Test build kubevela-core-api
-        env:
-          VERSION: ${{ steps.get_version.outputs.VERSION }}
-          COMMIT_ID: ${{ github.sha }}
-        run: |
-          bash ./hack/apis/clientgen.sh
-          bash ./hack/apis/sync.sh test

.github/workflows/definition-lint.yml

@@ -11,9 +11,6 @@ on:
       - master
       - release-*
 
-permissions:
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
@@ -23,17 +20,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v3
         with:
           submodules: true
 
       - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.9
         with:
           version: v1.20
           github-token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -13,38 +13,51 @@ on:
       - master
       - release-*
 
-permissions:
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
   detect-noop:
-    permissions:
-      actions: write
     runs-on: ubuntu-20.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
+
+  set-k8s-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
+    steps:
+      - id: set-k8s-matrix
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            echo "pushing tag: ${{ github.ref_name }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+          else
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+          fi
+
 
   e2e-multi-cluster-tests:
     runs-on: aliyun
-    needs: [ detect-noop ]
+    needs: [ detect-noop,set-k8s-matrix ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
       matrix:
-        k8s-version: ["v1.20","v1.24"]
+        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
       cancel-in-progress: true
@@ -52,10 +65,10 @@ jobs:
 
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -77,14 +90,14 @@ jobs:
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
 
       - name: Setup K3d (Hub)
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           k3d-args: ${{ env.EGRESS_ARG }}
 
       - name: Setup K3d (Worker)
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -117,7 +130,7 @@ jobs:
         run: make end-e2e-core
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: /tmp/e2e-profile.out,/tmp/e2e_multicluster_test.out

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

@@ -13,38 +13,50 @@ on:
       - master
       - release-*
 
-permissions:
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
   detect-noop:
-    permissions:
-      actions: write
     runs-on: ubuntu-20.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
+
+  set-k8s-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
+    steps:
+      - id: set-k8s-matrix
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            echo "pushing tag: ${{ github.ref_name }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+          else
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+          fi
 
   e2e-rollout-tests:
     runs-on: aliyun
-    needs: [ detect-noop ]
+    needs: [ detect-noop,set-k8s-matrix ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
       matrix:
-        k8s-version: ["v1.20","v1.24"]
+        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
       cancel-in-progress: true
@@ -52,10 +64,10 @@ jobs:
 
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -77,7 +89,7 @@ jobs:
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
 
       - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -101,7 +113,7 @@ jobs:
         run: make end-e2e
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: /tmp/e2e-profile.out

.github/workflows/e2e-test.yml

@@ -13,38 +13,50 @@ on:
       - master
       - release-*
 
-permissions:
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
   detect-noop:
-    permissions:
-      actions: write
     runs-on: ubuntu-20.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
+
+  set-k8s-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-k8s-matrix.outputs.matrix }}
+    steps:
+      - id: set-k8s-matrix
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            echo "pushing tag: ${{ github.ref_name }}"
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSIONS }}"
+          else
+            echo "::set-output name=matrix::${{ env.K3D_IMAGE_VERSION }}"
+          fi
 
   e2e-tests:
     runs-on: aliyun
-    needs: [ detect-noop ]
+    needs: [ detect-noop,set-k8s-matrix ]
     if: needs.detect-noop.outputs.noop != 'true'
     strategy:
       matrix:
-        k8s-version: ["v1.20","v1.24"]
+        k8s-version: ${{ fromJson(needs.set-k8s-matrix.outputs.matrix) }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }}
       cancel-in-progress: true
@@ -52,10 +64,10 @@ jobs:
 
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -77,7 +89,7 @@ jobs:
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
 
       - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: ${{ matrix.k8s-version }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -108,7 +120,7 @@ jobs:
         run: make end-e2e
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: /tmp/e2e-profile.out

.github/workflows/go.yml

@@ -11,9 +11,6 @@ on:
       - master
       - release-*
 
-permissions:  # added using https://github.com/step-security/secure-workflows
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
@@ -25,17 +22,15 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
-    permissions:
-      actions: write
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
 
   staticcheck:
     runs-on: ubuntu-20.04
@@ -44,17 +39,27 @@ jobs:
 
     steps:
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
+      - name: Install StaticCheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@2022.1
+
       - name: Static Check
-        run: make staticcheck
+        run: staticcheck ./...
 
       - name: License Header Check
         run: make check-license-header
@@ -63,27 +68,31 @@ jobs:
     runs-on: ubuntu-20.04
     needs: detect-noop
     if: needs.detect-noop.outputs.noop != 'true'
-    permissions:
-      contents: read  # for actions/checkout to fetch code
-      pull-requests: read  # for golangci/golangci-lint-action to fetch pull requests
 
     steps:
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: .work/pkg
+          key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-pkg-
+
       # This action uses its own setup-go, which always seems to use the latest
       # stable version of Go. We could run 'make lint' to ensure our desired Go
       # version, but we prefer this action because it leaves 'annotations' (i.e.
       # it comments on PRs to point out linter violations).
       - name: Lint
-        uses: golangci/golangci-lint-action@07db5389c99593f11ad7b44463c2d4233066a9b1 # v3.3.0
+        uses: golangci/golangci-lint-action@v3
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 
@@ -94,32 +103,39 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Setup node
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
+        uses: actions/setup-node@v2
         with:
           node-version: '14'
 
+      - name: Install StaticCheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@2022.1
+
       - name: Cache Go Dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+        uses: actions/cache@v2
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-pkg-
 
+      - name: Check code formatting
+        run: go install golang.org/x/tools/cmd/goimports && make fmt
+
       - name: Run cross-build
         run: make cross-build
 
       - name: Check Diff
         run: |
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
           export PATH=$(pwd)/bin/:$PATH
           make check-diff
               
@@ -133,17 +149,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
       - name: Setup Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Cache Go Dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+        uses: actions/cache@v2
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -157,62 +173,3 @@ jobs:
         run: |
           move .\bin\vela .\bin\vela.exe
           .\bin\vela.exe version
-
-  check-core-image-build:
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-        with:
-          submodules: true
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
-      - name: Build Test for vela core
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
-        with:
-          context: .
-          file: Dockerfile
-          platforms: linux/amd64,linux/arm64
-
-  check-apiserver-image-build:
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-        with:
-          submodules: true
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
-      - name: Build Test for apiserver
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
-        with:
-          context: .
-          file: Dockerfile.apiserver
-          platforms: linux/amd64,linux/arm64
-
-  check-cli-image-build:
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: needs.detect-noop.outputs.noop != 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-        with:
-          submodules: true
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
-      - name: Build Test for CLI
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
-        with:
-          context: .
-          file: Dockerfile.cli

.github/workflows/issue-commands.yml

@@ -5,21 +5,18 @@ on:
   issue_comment:
     types: [created]
 
-permissions:
-  contents: read
-
 jobs:
   bot:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           repository: "oam-dev/kubevela-github-actions"
           path: ./actions
           ref: v0.4.2
       - name: Setup Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
+        uses: actions/setup-node@v3
         with:
           node-version: '14'
           cache: 'npm'
@@ -35,13 +32,10 @@ jobs:
   backport:
     runs-on: ubuntu-22.04
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/backport')
-    permissions:
-      issues: write
-      pull-requests: write
     steps:
       - name: Extract Command
         id: command
-        uses: xt0rted/slash-command-action@bf51f8f5f4ea3d58abc7eca58f77104182b23e88
+        uses: xt0rted/slash-command-action@v1
         with:
           repo-token: ${{ secrets.VELA_BOT_TOKEN }}
           command: backport
@@ -50,7 +44,7 @@ jobs:
           allow-edits: "false"
           permission-level: read
       - name: Handle Command
-        uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0
+        uses: actions/github-script@v4
         env:
           VERSION: ${{ steps.command.outputs.command-arguments }}
         with:
@@ -71,11 +65,11 @@ jobs:
             })
             console.log("Added '" + label + "' label.")
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@2ee900dc92632adf994f8e437b6d16840fd61f58
+        uses: zeebe-io/backport-action@v0.0.8
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/license.yml

@@ -9,16 +9,13 @@ on:
     branches:
       - master
       - release-*
-      -
-permissions:
-  contents: read
 
 jobs:
   license_check:
     runs-on: ubuntu-latest
     name: Check for unapproved licenses
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - uses: actions/checkout@v2
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/registry.yml

@@ -11,16 +11,11 @@ env:
   ACCESS_KEY: ${{ secrets.OSS_ACCESS_KEY }}
   ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
 
-permissions:
-  contents: read
-
 jobs:
   publish-core-images:
-    permissions:
-      packages: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - uses: actions/checkout@master
       - name: Get the version
         id: get_version
         run: |
@@ -28,36 +23,36 @@ jobs:
           if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
             VERSION=latest
           fi
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
         run: |
-          echo "git_revision=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
       - name: Login ghcr.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login docker.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: ${{ secrets.ACR_DOMAIN }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
-      - uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
         with:
           driver-opts: image=moby/buildkit:master
 
-      - uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+      - uses: docker/build-push-action@v2
         name: Build & Pushing vela-core for Dockerhub, GHCR and ACR
         with:
           context: .
@@ -76,7 +71,7 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
             ${{ secrets.ACR_DOMAIN }}/oamdev/vela-core:${{ steps.get_version.outputs.VERSION }}
 
-      - uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+      - uses: docker/build-push-action@v2
         name: Build & Pushing CLI for Dockerhub, GHCR and ACR
         with:
           context: .
@@ -96,11 +91,9 @@ jobs:
             ${{ secrets.ACR_DOMAIN }}/oamdev/vela-cli:${{ steps.get_version.outputs.VERSION }}
 
   publish-addon-images:
-    permissions:
-      packages: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - uses: actions/checkout@master
       - name: Get the version
         id: get_version
         run: |
@@ -108,36 +101,36 @@ jobs:
           if [[ ${GITHUB_REF} == "refs/heads/master" ]]; then
             VERSION=latest
           fi
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          echo ::set-output name=VERSION::${VERSION}
       - name: Get git revision
         id: vars
         shell: bash
         run: |
-          echo "git_revision=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "::set-output name=git_revision::$(git rev-parse --short HEAD)"
       - name: Login ghcr.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login docker.io
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login Alibaba Cloud ACR
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        uses: docker/login-action@v1
         with:
           registry: ${{ secrets.ACR_DOMAIN }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
-      - uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
-      - uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
         with:
           driver-opts: image=moby/buildkit:master
 
-      - uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+      - uses: docker/build-push-action@v2
         name: Build & Pushing vela-apiserver for Dockerhub, GHCR and ACR
         with:
           context: .
@@ -156,7 +149,7 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
             ${{ secrets.ACR_DOMAIN }}/oamdev/vela-apiserver:${{ steps.get_version.outputs.VERSION }}
 
-      - uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
+      - uses: docker/build-push-action@v2
         name: Build & Pushing runtime rollout Dockerhub, GHCR and ACR
         with:
           context: .
@@ -182,7 +175,7 @@ jobs:
       CAPABILITY_ENDPOINT: oss-cn-beijing.aliyuncs.com
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - uses: actions/checkout@master
       - name: Install ossutil
         run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
       - name: Configure Alibaba Cloud OSSUTIL
@@ -192,4 +185,4 @@ jobs:
       - name: rsync all capabilites
         run: rsync vela-templates/registry/auto-gen/* $CAPABILITY_DIR
       - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f
+        run: ./ossutil --config-file .ossutilconfig sync $CAPABILITY_DIR oss://$CAPABILITY_BUCKET -f

.github/workflows/release.yml

@@ -7,56 +7,119 @@ on:
   workflow_dispatch: { }
 
 env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUCKET: ${{ secrets.CLI_OSS_BUCKET }}
   ENDPOINT: ${{ secrets.CLI_OSS_ENDPOINT }}
   ACCESS_KEY: ${{ secrets.CLI_OSS_ACCESS_KEY }}
   ACCESS_KEY_SECRET: ${{ secrets.CLI_OSS_ACCESS_KEY_SECRET }}
 
-permissions:
-  contents: read
-
 jobs:
   build:
-    permissions:
-      contents: write
-      actions: read
-      checks: write
-      issues: read
-      packages: write
-      pull-requests: read
-      repository-projects: read
-      statuses: read
     runs-on: ubuntu-latest
-    name: goreleaser
+    name: build
+    strategy:
+      matrix:
+        TARGETS: [ linux/amd64, darwin/amd64, windows/amd64, linux/arm64, darwin/arm64 ]
+    env:
+      VELA_VERSION_KEY: github.com/oam-dev/kubevela/version.VelaVersion
+      VELA_GITVERSION_KEY: github.com/oam-dev/kubevela/version.GitRevision
+      GO_BUILD_ENV: GO111MODULE=on CGO_ENABLED=0
+      DIST_DIRS: find * -type d -exec
     steps:
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-        with:
-          fetch-depth: 0
-      - run: git fetch --force --tags
+        uses: actions/checkout@v2
       - name: Set up Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v2
         with:
           go-version: 1.19
-          cache: true
-      - uses: goreleaser/goreleaser-action@9754a253a8673b0ea869c2e863b4e975497efd0c # v4.1.1
-        with:
-          distribution: goreleaser
-          version: 1.14.1
-          args: release --rm-dist --timeout 60m
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Since goreleaser haven't supported aliyun OSS, we need to upload the release manually
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
       - name: Get version
         run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+      - name: Get matrix
+        id: get_matrix
+        run: |
+          TARGETS=${{matrix.TARGETS}}
+          echo ::set-output name=OS::${TARGETS%/*}
+          echo ::set-output name=ARCH::${TARGETS#*/}
+      - name: Get ldflags
+        id: get_ldflags
+        run: |
+          LDFLAGS="-s -w -X ${{ env.VELA_VERSION_KEY }}=${{ env.VELA_VERSION }} -X ${{ env.VELA_GITVERSION_KEY }}=git-$(git rev-parse --short HEAD)"
+          echo "LDFLAGS=${LDFLAGS}" >> $GITHUB_ENV
+      - name: Build
+        run: |
+          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
+            go build -ldflags "${{ env.LDFLAGS }}" \
+            -o _bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/vela -v \
+            ./references/cmd/cli/main.go
+          ${{ env.GO_BUILD_ENV }} GOOS=${{ steps.get_matrix.outputs.OS }} GOARCH=${{ steps.get_matrix.outputs.ARCH }} \
+            go build -ldflags "${{ env.LDFLAGS }}" \
+            -o _bin/kubectl-vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}/kubectl-vela -v \
+            ./cmd/plugin/main.go
+      - name: Compress
+        run: |
+          echo "\n## Release Info\nVERSION: ${{ env.VELA_VERSION }}" >> README.md && \
+          echo "GIT_COMMIT: ${GITHUB_SHA}\n" >> README.md && \
+          cd _bin/vela && \
+          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
+          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
+          ${{ env.DIST_DIRS }} tar -zcf vela-{}.tar.gz {} \; && \
+          ${{ env.DIST_DIRS }} zip -r vela-{}.zip {} \; && \
+          cd ../kubectl-vela && \
+          ${{ env.DIST_DIRS }} cp ../../LICENSE {} \; && \
+          ${{ env.DIST_DIRS }} cp ../../README.md {} \; && \
+          ${{ env.DIST_DIRS }} tar -zcf kubectl-vela-{}.tar.gz {} \; && \
+          ${{ env.DIST_DIRS }} zip -r kubectl-vela-{}.zip {} \; && \
+          cd .. && \
+          sha256sum vela/vela-* kubectl-vela/kubectl-vela-* >> sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt \
+      - name: Upload Vela tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Vela zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_name: vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          asset_content_type: binary/octet-stream
+      - name: Upload Kubectl-Vela zip
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./_bin/kubectl-vela/kubectl-vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_name: kubectl-vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
+          asset_content_type: binary/octet-stream
+      - name: Post sha256
+        uses: actions/upload-artifact@v2
+        with:
+          name: sha256sums
+          path: ./_bin/sha256-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.txt
+          retention-days: 1
+      - name: clear the asset
+        run: |
+          rm -rf ./_bin/vela/${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}
+          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.tar.gz
+          mv ./_bin/vela/vela-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip ./_bin/vela/vela-${{ env.VELA_VERSION }}-${{ steps.get_matrix.outputs.OS }}-${{ steps.get_matrix.outputs.ARCH }}.zip
       - name: Install ossutil
         run: wget http://gosspublic.alicdn.com/ossutil/1.7.0/ossutil64 && chmod +x ossutil64 && mv ossutil64 ossutil
       - name: Configure Alibaba Cloud OSSUTIL
-        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT}
-      - name: split files to be upload
-        run: mkdir -p ./dist/files_upload && mv ./dist/*.tar.gz ./dist/files_upload && mv ./dist/*.zip ./dist/files_upload
+        run: ./ossutil --config-file .ossutilconfig config -i ${ACCESS_KEY} -k ${ACCESS_KEY_SECRET} -e ${ENDPOINT} -c .ossutilconfig
       - name: sync local to cloud
-        run: ./ossutil --config-file .ossutilconfig sync ./dist/files_upload oss://$BUCKET/binary/vela/${{ env.VELA_VERSION }}
+        run: ./ossutil --config-file .ossutilconfig sync ./_bin/vela oss://$BUCKET/binary/vela/${{ env.VELA_VERSION }}
+      
       - name: sync the latest version file
         if: ${{ !contains(env.VELA_VERSION,'alpha') && !contains(env.VELA_VERSION,'beta') }}
         run: |
@@ -67,26 +130,48 @@ jobs:
           verlte ${{ env.VELA_VERSION }} $LATEST_VERSION && echo "${{ env.VELA_VERSION }} <= $LATEST_VERSION, skip update" && exit 0
           echo ${{ env.VELA_VERSION }} > ./latest_version
           ./ossutil --config-file .ossutilconfig cp -u ./latest_version oss://$BUCKET/binary/vela/latest_version
+
+
   upload-plugin-homebrew:
-    permissions:
-      contents: write
-      actions: read
-      checks: write
-      issues: read
-      packages: write
-      pull-requests: read
-      repository-projects: read
-      statuses: read
     needs: build
     runs-on: ubuntu-latest
     name: upload-sha256sums
     steps:
       - name: Checkout
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
+      - name: Download sha256sums
+        uses: actions/download-artifact@v2
+        with:
+          name: sha256sums
+          path: cli-artifacts
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: cli-artifacts
+      - name: Get version
+        run: echo "VELA_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+      - shell: bash
+        working-directory: cli-artifacts
+        run: |
+          for file in *
+          do
+            sed -i "s/\/vela/-${{ env.VELA_VERSION }}/g" ${file}
+            sed -i "s/\/kubectl-vela/-${{ env.VELA_VERSION }}/g" ${file}
+            cat ${file} >> sha256sums.txt
+          done
+      - name: Upload Checksums
+        uses: actions/upload-release-asset@v1.0.2
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: cli-artifacts/sha256sums.txt
+          asset_name: sha256sums.txt
+          asset_content_type: text/plain
       - name: Update kubectl plugin version in krew-index
-        uses: rajatjindal/krew-release-bot@3320c0b546b5d2320613c46762bd3f73e2801bdc # v0.0.38
+        uses: rajatjindal/krew-release-bot@v0.0.38
       - name: Update Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@02e79d9da43d79efa846d73695b6052cbbdbf48a # v3.8.3
+        uses: dawidd6/action-homebrew-bump-formula@v3
         with:
           token: ${{ secrets.HOMEBREW_TOKEN }}
           formula: kubevela

.github/workflows/scorecards.yml

@@ -1,60 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  schedule:
-    # Weekly on Saturdays.
-    - cron: '30 1 * * 6'
-  push:
-    branches: [ master ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Used to receive a badge. (Upcoming feature)
-      id-token: write
-      actions: read
-      contents: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@937ffa90d79c7d720498178154ad4c7ba1e4ad8c # tag=v2.1.0
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecards on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`, regardless
-          # of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # v2.1.37
-        with:
-          sarif_file: results.sarif

.github/workflows/sync-api.yml

@@ -7,27 +7,25 @@ on:
     tags:
       - "v*"
 
-permissions:
-  contents: read
-
-env:
-  GO_VERSION: '1.19'
-
 jobs:
   sync-core-api:
     runs-on: ubuntu-20.04
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+      - name: Set up Go 1.17
+        uses: actions/setup-go@v1
+        env:
+          GO_VERSION: '1.19'
+          GOLANGCI_VERSION: 'v1.49'
         with:
           go-version: ${{ env.GO_VERSION }}
+        id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
 
       - name: Get the version
         id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
 
       - name: Sync to kubevela-core-api Repo
         env:
@@ -36,4 +34,4 @@ jobs:
           COMMIT_ID: ${{ github.sha }}
         run: |
           bash ./hack/apis/clientgen.sh
-          bash ./hack/apis/sync.sh sync
+          bash ./hack/apis/sync.sh

.github/workflows/timed-task.yml

@@ -2,10 +2,6 @@ name: Timed Task
 on:
   schedule:
     - cron: '* * * * *'
-
-permissions:
-  contents: read
-
 jobs:
   clean-image:
     runs-on: aliyun

.github/workflows/trivy-scan.yml

@@ -4,16 +4,13 @@ on:
   pull_request:
     branches: [ master ]
 
-permissions:
-  contents: read
-
 jobs:
   images:
     name: Image Scan
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
 
       - name: Build Vela Core image from Dockerfile
         run: |
@@ -27,7 +24,7 @@ jobs:
           output: 'trivy-results.sarif'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v1
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/unit-test.yml

@@ -5,36 +5,32 @@ on:
     branches:
       - master
       - release-*
-  workflow_dispatch: { }
+  workflow_dispatch: {}
   pull_request:
     branches:
       - master
       - release-*
 
-permissions:
-  contents: read
-
 env:
   # Common versions
   GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
 
 jobs:
 
   detect-noop:
-    permissions:
-      actions: write  # for fkirc/skip-duplicate-actions to skip or stop workflow runs
     runs-on: ubuntu-20.04
     outputs:
       noop: ${{ steps.noop.outputs.should_skip }}
     steps:
       - name: Detect No-op Changes
         id: noop
-        uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           paths_ignore: '["**.md", "**.mdx", "**.png", "**.jpg"]'
           do_not_skip: '["workflow_dispatch", "schedule", "push"]'
-        continue-on-error: true
+          concurrent_skipping: false
 
   unit-tests:
     runs-on: ubuntu-20.04
@@ -43,17 +39,18 @@ jobs:
 
     steps:
       - name: Set up Go
-        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
+        uses: actions/setup-go@v1
         with:
           go-version: ${{ env.GO_VERSION }}
+        id: go
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+        uses: actions/checkout@v2
         with:
           submodules: true
 
       - name: Cache Go Dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+        uses: actions/cache@v2
         with:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
@@ -66,14 +63,13 @@ jobs:
           sudo apt-get install -y golang-ginkgo-dev
 
       - name: Setup K3d
-        uses: nolar/setup-k3d-k3s@293b8e5822a20bc0d5bcdd4826f1a665e72aba96
+        uses: nolar/setup-k3d-k3s@v1.0.8
         with:
           version: v1.20
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-        # TODO need update action version to resolve node 12 deprecated.
       - name: install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@ff52bff1bae252239223476e5ab0d71d6ba02343
+        uses: RyanSiu1995/kubebuilder-action@v1.2
         with:
           version: 3.1.0
           kubebuilderOnly: false
@@ -83,7 +79,7 @@ jobs:
         run: make test
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt

.gitignore

@@ -53,5 +53,3 @@ git-page/
 # e2e rollout runtime image build
 runtime/rollout/e2e/tmp
 vela.json
-
-dist/

.goreleaser.yaml

@@ -1,76 +0,0 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
-builds:
-  - id: vela-cli
-    binary: vela
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarch:
-      - amd64
-      - arm64
-    main: ./references/cmd/cli/main.go
-    ldflags:
-      - -s -w -X github.com/oam-dev/kubevela/version.VelaVersion={{ .Version }} -X github.com/oam-dev/kubevela/version.GitRevision=git-{{.ShortCommit}}
-    env:
-      - CGO_ENABLED=0
-
-  - id: kubectl-vela
-    binary: kubectl-vela
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarch:
-      - amd64
-      - arm64
-    main: ./cmd/plugin/main.go
-    ldflags:
-      - -s -w -X github.com/oam-dev/kubevela/version.VelaVersion={{ .Version }} -X github.com/oam-dev/kubevela/version.GitRevision=git-{{.ShortCommit}}
-
-archives:
-  - format: tar.gz
-    id: vela-cli-tgz
-    wrap_in_directory: '{{ .Os }}-{{ .Arch }}'
-    builds:
-      - vela-cli
-    name_template: '{{ trimsuffix .ArtifactName ".exe" }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
-    files: [ LICENSE, README.md ]
-  - format: zip
-    id: vela-cli-zip
-    builds:
-      - vela-cli
-    wrap_in_directory: '{{ .Os }}-{{ .Arch }}'
-    name_template: '{{ trimsuffix .ArtifactName ".exe" }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
-    files: [ LICENSE, README.md ]
-  - format: tar.gz
-    id: plugin-tgz
-    builds:
-      - kubectl-vela
-    wrap_in_directory: '{{ .Os }}-{{ .Arch }}'
-    name_template: '{{ trimsuffix .ArtifactName ".exe" }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
-    files: [ LICENSE, README.md ]
-  - format: zip
-    id: plugin-zip
-    builds:
-      - kubectl-vela
-    wrap_in_directory: '{{ .Os }}-{{ .Arch }}'
-    name_template: '{{ trimsuffix .ArtifactName ".exe" }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
-    files: [ LICENSE, README.md ]
-
-checksum:
-  name_template: 'sha256sums.txt'
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-
-# The lines beneath this are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj

.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.exe"
-      to: "."
+    - from: "*/kubectl-vela"
+      to: "kubectl-vela.exe"
     - from: "*/LICENSE"
       to: "."
     bin: "kubectl-vela.exe"

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine@sha256:a9b24b67dc83b3383d22a14941c2b2b2ca6a103d805cac6820fd1355943beaf1 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -15,8 +15,9 @@ ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source for building core
-COPY cmd/core/ cmd/core/
+# Copy the go source
+COPY cmd/core/main.go main.go
+COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
@@ -28,13 +29,13 @@ ARG VERSION
 ARG GITVERSION
 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}" \
-    -o manager-${TARGETARCH} cmd/core/main.go
+    -o manager-${TARGETARCH} main.go
 
 # Use alpine as base image due to the discussion in issue #1448
 # 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@sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479}
+FROM ${BASE_IMAGE:-alpine:3.15}
 # This is required by daemon connecting with cri
 RUN apk add --no-cache ca-certificates bash expat
 

Dockerfile.apiserver

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine@sha256:a9b24b67dc83b3383d22a14941c2b2b2ca6a103d805cac6820fd1355943beaf1 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace
@@ -11,8 +11,9 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source for building apiserver
-COPY cmd/apiserver/ cmd/apiserver/
+# Copy the go source
+COPY cmd/core/main.go main.go
+COPY cmd/apiserver/main.go cmd/apiserver/main.go
 COPY apis/ apis/
 COPY pkg/ pkg/
 COPY version/ version/
@@ -32,7 +33,7 @@ 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@sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479}
+FROM ${BASE_IMAGE:-alpine:3.15}
 # This is required by daemon connecting with cri
 RUN apk add --no-cache ca-certificates bash expat
 

Dockerfile.cli

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the cli binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine@sha256:a9b24b67dc83b3383d22a14941c2b2b2ca6a103d805cac6820fd1355943beaf1 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace
@@ -32,7 +32,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH:-amd64} \
 # 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@sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479}
+FROM ${BASE_IMAGE:-alpine:3.15}
 # This is required by daemon connecting with cri
 RUN apk add --no-cache ca-certificates bash expat
 

Dockerfile.e2e

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine@sha256:a9b24b67dc83b3383d22a14941c2b2b2ca6a103d805cac6820fd1355943beaf1 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -38,7 +38,7 @@ 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@sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479}
+FROM ${BASE_IMAGE:-alpine:3.15}
 # This is required by daemon connecting with cri
 RUN apk add --no-cache ca-certificates bash expat
 

GOVERNANCE.md

@@ -1 +1,16 @@
-Refer to https://github.com/kubevela/community/blob/main/GOVERNANCE.md
+# Governance
+
+[Project maintainers](https://github.com/kubevela/community/blob/main/OWNERS.md#maintainers) are responsible for activities around maintaining and updating KubeVela.
+Final decisions on the project reside with the project maintainers.
+
+Maintainers **MUST** remain active. If they are unresponsive for >6 months,
+they will be automatically removed unless a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) of the other project maintainers agrees to extend the period to be greater than 6 months.
+
+New maintainers can be added to the project by a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) vote of the existing maintainers.
+A potential maintainer may be nominated by an existing maintainer.
+A vote is conducted in private between the current maintainers over the course of a one week voting period.
+At the end of the week, votes are counted and a pull request is made on the repo adding the new maintainer to the [CODEOWNERS](https://github.com/kubevela/kubevela/blob/master/.github/CODEOWNERS) file.
+
+A maintainer may step down by submitting an [issue](https://github.com/kubevela/kubevela/issues/new/choose) stating their intent.
+
+Changes to this governance document require a pull request with approval from a [super-majority](https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote) of the current maintainers.

README.md

@@ -6,7 +6,7 @@
   </p>
 </div>
 
-![Build status](https://github.com/kubevela/kubevela/workflows/Go/badge.svg)
+![Build status](https://github.com/kubevela/kubevela/workflows/E2E/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubevela/kubevela)](https://goreportcard.com/report/github.com/kubevela/kubevela)
 ![Docker Pulls](https://img.shields.io/docker/pulls/oamdev/vela-core)
 [![codecov](https://codecov.io/gh/kubevela/kubevela/branch/master/graph/badge.svg)](https://codecov.io/gh/kubevela/kubevela)
@@ -16,8 +16,6 @@
 [![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)
-![E2E status](https://github.com/kubevela/kubevela/workflows/E2E%20Test/badge.svg)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/kubevela/kubevela/badge)](https://api.securityscorecards.dev/projects/github.com/kubevela/kubevela)
 
 ## Introduction
 

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

@@ -137,9 +137,6 @@ type Terraform struct {
 
 	// Region is cloud provider's region. It will override the region in the region field of ProviderReference
 	Region string `json:"customRegion,omitempty"`
-
-	// GitCredentialsSecretReference specifies the reference to the secret containing the git credentials
-	GitCredentialsSecretReference *corev1.SecretReference `json:"gitCredentialsSecretReference,omitempty"`
 }
 
 // A WorkloadTypeDescriptor refer to a Workload Type
@@ -577,29 +574,3 @@ type ReferredObjectList struct {
 	// +optional
 	Objects []ReferredObject `json:"objects,omitempty"`
 }
-
-// ContainerState defines the state of a container
-type ContainerState string
-
-const (
-	// ContainerRunning indicates the container is running
-	ContainerRunning ContainerState = "Running"
-	// ContainerWaiting indicates the container is waiting
-	ContainerWaiting ContainerState = "Waiting"
-	// ContainerTerminated indicates the container is terminated
-	ContainerTerminated ContainerState = "Terminated"
-)
-
-// ContainerStateToString convert the container state to string
-func ContainerStateToString(state corev1.ContainerState) string {
-	switch {
-	case state.Running != nil:
-		return "Running"
-	case state.Waiting != nil:
-		return "Waiting"
-	case state.Terminated != nil:
-		return "Terminated"
-	default:
-		return "Unknown"
-	}
-}

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

@@ -58,17 +58,3 @@ func TestClusterObjectReference(t *testing.T) {
 	o2.Cluster = "c"
 	r.False(o2.Equal(o1))
 }
-
-func TestContainerStateToString(t *testing.T) {
-	r := require.New(t)
-	r.Equal("Waiting", ContainerStateToString(v1.ContainerState{
-		Waiting: &v1.ContainerStateWaiting{},
-	}))
-	r.Equal("Running", ContainerStateToString(v1.ContainerState{
-		Running: &v1.ContainerStateRunning{},
-	}))
-	r.Equal("Terminated", ContainerStateToString(v1.ContainerState{
-		Terminated: &v1.ContainerStateTerminated{},
-	}))
-	r.Equal("Unknown", ContainerStateToString(v1.ContainerState{}))
-}

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

@@ -587,11 +587,6 @@ func (in *Terraform) DeepCopyInto(out *Terraform) {
 		*out = new(crossplane_runtime.Reference)
 		**out = **in
 	}
-	if in.GitCredentialsSecretReference != nil {
-		in, out := &in.GitCredentialsSecretReference, &out.GitCredentialsSecretReference
-		*out = new(v1.SecretReference)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.

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

@@ -59,13 +59,8 @@ type ApplyOnceStrategy struct {
 	ApplyOnceAffectStrategy ApplyOnceAffectStrategy `json:"affect"`
 }
 
-// Type the type name of the policy
-func (in *ApplyOncePolicySpec) Type() string {
-	return ApplyOncePolicyType
-}
-
 // FindStrategy find apply-once strategy for target resource
-func (in *ApplyOncePolicySpec) FindStrategy(manifest *unstructured.Unstructured) *ApplyOnceStrategy {
+func (in ApplyOncePolicySpec) FindStrategy(manifest *unstructured.Unstructured) *ApplyOnceStrategy {
 	if !in.Enable {
 		return nil
 	}

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

@@ -18,6 +18,10 @@ package v1alpha1
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/utils/pointer"
+	"k8s.io/utils/strings/slices"
+
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 const (
@@ -53,6 +57,59 @@ type GarbageCollectPolicyRule struct {
 	Strategy GarbageCollectStrategy     `json:"strategy"`
 }
 
+// ResourcePolicyRuleSelector select the targets of the rule
+// if multiple conditions are specified, combination logic is AND
+type ResourcePolicyRuleSelector struct {
+	CompNames        []string `json:"componentNames,omitempty"`
+	CompTypes        []string `json:"componentTypes,omitempty"`
+	OAMResourceTypes []string `json:"oamTypes,omitempty"`
+	TraitTypes       []string `json:"traitTypes,omitempty"`
+	ResourceTypes    []string `json:"resourceTypes,omitempty"`
+	ResourceNames    []string `json:"resourceNames,omitempty"`
+}
+
+// Match check if current rule selector match the target resource
+// If at least one condition is matched and no other condition failed (could be empty), return true
+// Otherwise, return false
+func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured) bool {
+	var compName, compType, oamType, traitType, resourceType, resourceName string
+	if labels := manifest.GetLabels(); labels != nil {
+		compName = labels[oam.LabelAppComponent]
+		compType = labels[oam.WorkloadTypeLabel]
+		oamType = labels[oam.LabelOAMResourceType]
+		traitType = labels[oam.TraitTypeLabel]
+	}
+	resourceType = manifest.GetKind()
+	resourceName = manifest.GetName()
+	match := func(src []string, val string) (found *bool) {
+		if len(src) == 0 {
+			return nil
+		}
+		return pointer.Bool(val != "" && slices.Contains(src, val))
+	}
+	conditions := []*bool{
+		match(in.CompNames, compName),
+		match(in.CompTypes, compType),
+		match(in.OAMResourceTypes, oamType),
+		match(in.TraitTypes, traitType),
+		match(in.ResourceTypes, resourceType),
+		match(in.ResourceNames, resourceName),
+	}
+	hasMatched := false
+	for _, cond := range conditions {
+		// if any non-empty condition failed, return false
+		if cond != nil && !*cond {
+			return false
+		}
+		// if condition succeed, record it
+		if cond != nil && *cond {
+			hasMatched = true
+		}
+	}
+	// if at least one condition is met, return true
+	return hasMatched
+}
+
 // GarbageCollectStrategy the strategy for target resource to recycle
 type GarbageCollectStrategy string
 
@@ -66,13 +123,8 @@ const (
 	GarbageCollectStrategyOnAppUpdate GarbageCollectStrategy = "onAppUpdate"
 )
 
-// Type the type name of the policy
-func (in *GarbageCollectPolicySpec) Type() string {
-	return GarbageCollectPolicyType
-}
-
 // FindStrategy find gc strategy for target resource
-func (in *GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
+func (in GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstructured) *GarbageCollectStrategy {
 	for _, rule := range in.Rules {
 		if rule.Selector.Match(manifest) {
 			return &rule.Strategy

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

@@ -16,6 +16,8 @@ limitations under the License.
 
 package v1alpha1
 
+import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 const (
 	// TopologyPolicyType refers to the type of topology policy
 	TopologyPolicyType = "topology"
@@ -23,6 +25,8 @@ const (
 	OverridePolicyType = "override"
 	// DebugPolicyType refers to the type of debug policy
 	DebugPolicyType = "debug"
+	// SharedResourcePolicyType refers to the type of shared resource policy
+	SharedResourcePolicyType = "shared-resource"
 	// ReplicationPolicyType refers to the type of replication policy
 	ReplicationPolicyType = "replication"
 )
@@ -60,6 +64,26 @@ type OverridePolicySpec struct {
 	Selector   []string            `json:"selector,omitempty"`
 }
 
+// SharedResourcePolicySpec defines the spec of shared-resource policy
+type SharedResourcePolicySpec struct {
+	Rules []SharedResourcePolicyRule `json:"rules"`
+}
+
+// SharedResourcePolicyRule defines the rule for sharing resources
+type SharedResourcePolicyRule struct {
+	Selector ResourcePolicyRuleSelector `json:"selector"`
+}
+
+// FindStrategy return if the target resource should be shared
+func (in SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
+	for _, rule := range in.Rules {
+		if rule.Selector.Match(manifest) {
+			return true
+		}
+	}
+	return false
+}
+
 // ReplicationPolicySpec defines the spec of replication policy
 // Override policy should be used together with replication policy to select the deployment target components
 type ReplicationPolicySpec struct {

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

@@ -1,49 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-const (
-	// ReadOnlyPolicyType refers to the type of read-only policy
-	ReadOnlyPolicyType = "read-only"
-)
-
-// ReadOnlyPolicySpec defines the spec of read-only policy
-type ReadOnlyPolicySpec struct {
-	Rules []ReadOnlyPolicyRule `json:"rules"`
-}
-
-// Type the type name of the policy
-func (in *ReadOnlyPolicySpec) Type() string {
-	return ReadOnlyPolicyType
-}
-
-// ReadOnlyPolicyRule defines the rule for read-only resources
-type ReadOnlyPolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-}
-
-// FindStrategy return if the target resource is read-only
-func (in *ReadOnlyPolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return true
-		}
-	}
-	return false
-}

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

@@ -18,7 +18,6 @@ package v1alpha1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
 	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
@@ -58,5 +57,4 @@ var (
 func init() {
 	SchemeBuilder.Register(&Policy{}, &PolicyList{})
 	SchemeBuilder.Register(&workflowv1alpha1.Workflow{}, &workflowv1alpha1.WorkflowList{})
-	_ = SchemeBuilder.AddToScheme(k8sscheme.Scheme)
 }

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

@@ -1,78 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/utils/pointer"
-	stringslices "k8s.io/utils/strings/slices"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-// ResourcePolicyRuleSelector select the targets of the rule
-// if multiple conditions are specified, combination logic is AND
-type ResourcePolicyRuleSelector struct {
-	CompNames        []string `json:"componentNames,omitempty"`
-	CompTypes        []string `json:"componentTypes,omitempty"`
-	OAMResourceTypes []string `json:"oamTypes,omitempty"`
-	TraitTypes       []string `json:"traitTypes,omitempty"`
-	ResourceTypes    []string `json:"resourceTypes,omitempty"`
-	ResourceNames    []string `json:"resourceNames,omitempty"`
-}
-
-// Match check if current rule selector match the target resource
-// If at least one condition is matched and no other condition failed (could be empty), return true
-// Otherwise, return false
-func (in *ResourcePolicyRuleSelector) Match(manifest *unstructured.Unstructured) bool {
-	var compName, compType, oamType, traitType, resourceType, resourceName string
-	if labels := manifest.GetLabels(); labels != nil {
-		compName = labels[oam.LabelAppComponent]
-		compType = labels[oam.WorkloadTypeLabel]
-		oamType = labels[oam.LabelOAMResourceType]
-		traitType = labels[oam.TraitTypeLabel]
-	}
-	resourceType = manifest.GetKind()
-	resourceName = manifest.GetName()
-	match := func(src []string, val string) (found *bool) {
-		if len(src) == 0 {
-			return nil
-		}
-		return pointer.Bool(val != "" && stringslices.Contains(src, val))
-	}
-	conditions := []*bool{
-		match(in.CompNames, compName),
-		match(in.CompTypes, compType),
-		match(in.OAMResourceTypes, oamType),
-		match(in.TraitTypes, traitType),
-		match(in.ResourceTypes, resourceType),
-		match(in.ResourceNames, resourceName),
-	}
-	hasMatched := false
-	for _, cond := range conditions {
-		// if any non-empty condition failed, return false
-		if cond != nil && !*cond {
-			return false
-		}
-		// if condition succeed, record it
-		if cond != nil && *cond {
-			hasMatched = true
-		}
-	}
-	// if at least one condition is met, return true
-	return hasMatched
-}

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

@@ -1,49 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-const (
-	// SharedResourcePolicyType refers to the type of shared resource policy
-	SharedResourcePolicyType = "shared-resource"
-)
-
-// SharedResourcePolicySpec defines the spec of shared-resource policy
-type SharedResourcePolicySpec struct {
-	Rules []SharedResourcePolicyRule `json:"rules"`
-}
-
-// Type the type name of the policy
-func (in *SharedResourcePolicySpec) Type() string {
-	return SharedResourcePolicyType
-}
-
-// SharedResourcePolicyRule defines the rule for sharing resources
-type SharedResourcePolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-}
-
-// FindStrategy return if the target resource should be shared
-func (in *SharedResourcePolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return true
-		}
-	}
-	return false
-}

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

@@ -1,49 +0,0 @@
-/*
-Copyright 2022 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-const (
-	// TakeOverPolicyType refers to the type of take-over policy
-	TakeOverPolicyType = "take-over"
-)
-
-// TakeOverPolicySpec defines the spec of take-over policy
-type TakeOverPolicySpec struct {
-	Rules []TakeOverPolicyRule `json:"rules"`
-}
-
-// Type the type name of the policy
-func (in *TakeOverPolicySpec) Type() string {
-	return TakeOverPolicyType
-}
-
-// TakeOverPolicyRule defines the rule for taking over resources
-type TakeOverPolicyRule struct {
-	Selector ResourcePolicyRuleSelector `json:"selector"`
-}
-
-// FindStrategy return if the target resource should be taken over
-func (in *TakeOverPolicySpec) FindStrategy(manifest *unstructured.Unstructured) bool {
-	for _, rule := range in.Rules {
-		if rule.Selector.Match(manifest) {
-			return true
-		}
-	}
-	return false
-}

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

@@ -585,44 +585,6 @@ func (in *PolicyList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReadOnlyPolicyRule) DeepCopyInto(out *ReadOnlyPolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReadOnlyPolicyRule.
-func (in *ReadOnlyPolicyRule) DeepCopy() *ReadOnlyPolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(ReadOnlyPolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReadOnlyPolicySpec) DeepCopyInto(out *ReadOnlyPolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]ReadOnlyPolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReadOnlyPolicySpec.
-func (in *ReadOnlyPolicySpec) DeepCopy() *ReadOnlyPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ReadOnlyPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RefObjectsComponentSpec) DeepCopyInto(out *RefObjectsComponentSpec) {
 	*out = *in
@@ -758,44 +720,6 @@ func (in *SharedResourcePolicySpec) DeepCopy() *SharedResourcePolicySpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TakeOverPolicyRule) DeepCopyInto(out *TakeOverPolicyRule) {
-	*out = *in
-	in.Selector.DeepCopyInto(&out.Selector)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TakeOverPolicyRule.
-func (in *TakeOverPolicyRule) DeepCopy() *TakeOverPolicyRule {
-	if in == nil {
-		return nil
-	}
-	out := new(TakeOverPolicyRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TakeOverPolicySpec) DeepCopyInto(out *TakeOverPolicySpec) {
-	*out = *in
-	if in.Rules != nil {
-		in, out := &in.Rules, &out.Rules
-		*out = make([]TakeOverPolicyRule, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TakeOverPolicySpec.
-func (in *TakeOverPolicySpec) DeepCopy() *TakeOverPolicySpec {
-	if in == nil {
-		return nil
-	}
-	out := new(TakeOverPolicySpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // 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

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

@@ -17,12 +17,10 @@
 package v1beta1
 
 import (
-	"encoding/json"
-
-	"github.com/kubevela/pkg/util/compression"
-	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	workflowv1alpha1 "github.com/kubevela/workflow/api/v1alpha1"
+
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/v1alpha1"
 )
@@ -31,16 +29,6 @@ import (
 
 // ApplicationRevisionSpec is the spec of ApplicationRevision
 type ApplicationRevisionSpec struct {
-	// ApplicationRevisionCompressibleFields represents all the fields that can be compressed.
-	ApplicationRevisionCompressibleFields `json:",inline"`
-
-	// Compression represents the compressed components in apprev in base64 (if compression is enabled).
-	Compression ApplicationRevisionCompression `json:"compression,omitempty"`
-}
-
-// ApplicationRevisionCompressibleFields represents all the fields that can be compressed.
-// So we can better organize them and compress only the compressible fields.
-type ApplicationRevisionCompressibleFields struct {
 	// Application records the snapshot of the created/modified Application
 	Application Application `json:"application"`
 
@@ -76,67 +64,12 @@ type ApplicationRevisionCompressibleFields struct {
 	ReferredObjects []common.ReferredObject `json:"referredObjects,omitempty"`
 }
 
-// ApplicationRevisionCompression represents the compressed components in apprev in base64.
-type ApplicationRevisionCompression struct {
-	compression.CompressedText `json:",inline"`
-}
-
-// MarshalJSON serves the same purpose as the one in ResourceTrackerSpec.
-func (apprev *ApplicationRevisionSpec) MarshalJSON() ([]byte, error) {
-	type Alias ApplicationRevisionSpec
-	tmp := &struct {
-		*Alias
-	}{}
-
-	if apprev.Compression.Type == compression.Uncompressed {
-		tmp.Alias = (*Alias)(apprev)
-	} else {
-		cpy := apprev.DeepCopy()
-		err := cpy.Compression.EncodeFrom(cpy.ApplicationRevisionCompressibleFields)
-		cpy.ApplicationRevisionCompressibleFields = ApplicationRevisionCompressibleFields{
-			// Application needs to have components.
-			Application: Application{Spec: ApplicationSpec{Components: []common.ApplicationComponent{}}},
-		}
-		if err != nil {
-			return nil, err
-		}
-		tmp.Alias = (*Alias)(cpy)
-	}
-
-	return json.Marshal(tmp.Alias)
-}
-
-// UnmarshalJSON serves the same purpose as the one in ResourceTrackerSpec.
-func (apprev *ApplicationRevisionSpec) UnmarshalJSON(data []byte) error {
-	type Alias ApplicationRevisionSpec
-	tmp := &struct {
-		*Alias
-	}{}
-
-	if err := json.Unmarshal(data, tmp); err != nil {
-		return err
-	}
-
-	if tmp.Compression.Type != compression.Uncompressed {
-		err := tmp.Compression.DecodeTo(&tmp.ApplicationRevisionCompressibleFields)
-		if err != nil {
-			return err
-		}
-		tmp.Compression.Clean()
-	}
-
-	(*ApplicationRevisionSpec)(tmp.Alias).DeepCopyInto(apprev)
-	return nil
-}
-
 // ApplicationRevisionStatus is the status of ApplicationRevision
 type ApplicationRevisionStatus struct {
 	// Succeeded records if the workflow finished running with success
 	Succeeded bool `json:"succeeded"`
 	// Workflow the running status of the workflow
 	Workflow *common.WorkflowStatus `json:"workflow,omitempty"`
-	// Record the context values to the revision.
-	WorkflowContext map[string]string `json:"workflowContext,omitempty"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -1,86 +0,0 @@
-/*
-Copyright 2021 The KubeVela Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1beta1
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/kubevela/pkg/util/compression"
-	"github.com/stretchr/testify/assert"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
-)
-
-func TestApplicationRevisionCompression(t *testing.T) {
-	// Fill data
-	spec := &ApplicationRevisionSpec{}
-	spec.Application = Application{Spec: ApplicationSpec{Components: []common.ApplicationComponent{{Name: "test-name"}}}}
-	spec.ComponentDefinitions = make(map[string]ComponentDefinition)
-	spec.ComponentDefinitions["def"] = ComponentDefinition{Spec: ComponentDefinitionSpec{PodSpecPath: "path"}}
-	spec.WorkloadDefinitions = make(map[string]WorkloadDefinition)
-	spec.WorkloadDefinitions["def"] = WorkloadDefinition{Spec: WorkloadDefinitionSpec{Reference: common.DefinitionReference{Name: "testdef"}}}
-	spec.TraitDefinitions = make(map[string]TraitDefinition)
-	spec.TraitDefinitions["def"] = TraitDefinition{Spec: TraitDefinitionSpec{ControlPlaneOnly: true}}
-	spec.ScopeDefinitions = make(map[string]ScopeDefinition)
-	spec.ScopeDefinitions["def"] = ScopeDefinition{Spec: ScopeDefinitionSpec{AllowComponentOverlap: true}}
-	spec.PolicyDefinitions = make(map[string]PolicyDefinition)
-	spec.PolicyDefinitions["def"] = PolicyDefinition{Spec: PolicyDefinitionSpec{ManageHealthCheck: true}}
-	spec.WorkflowStepDefinitions = make(map[string]WorkflowStepDefinition)
-	spec.WorkflowStepDefinitions["def"] = WorkflowStepDefinition{Spec: WorkflowStepDefinitionSpec{Reference: common.DefinitionReference{Name: "testname"}}}
-	spec.ReferredObjects = []common.ReferredObject{{RawExtension: runtime.RawExtension{Raw: []byte("123")}}}
-
-	testAppRev := &ApplicationRevision{Spec: *spec}
-
-	marshalAndUnmarshal := func(in *ApplicationRevision) (*ApplicationRevision, int) {
-		out := &ApplicationRevision{}
-		b, err := json.Marshal(in)
-		assert.NoError(t, err)
-		if in.Spec.Compression.Type != compression.Uncompressed {
-			assert.Contains(t, string(b), fmt.Sprintf("\"type\":\"%s\",\"data\":\"", in.Spec.Compression.Type))
-		}
-		err = json.Unmarshal(b, out)
-		assert.NoError(t, err)
-		assert.Equal(t, out.Spec.Compression.Type, in.Spec.Compression.Type)
-		assert.Equal(t, out.Spec.Compression.Data, "")
-		return out, len(b)
-	}
-
-	// uncompressed
-	testAppRev.Spec.Compression.SetType(compression.Uncompressed)
-	uncomp, uncompsize := marshalAndUnmarshal(testAppRev)
-
-	// zstd compressed
-	testAppRev.Spec.Compression.SetType(compression.Zstd)
-	zstdcomp, zstdsize := marshalAndUnmarshal(testAppRev)
-	// We will compare content later. Clear compression methods since it will interfere
-	// comparison and is verified earlier.
-	zstdcomp.Spec.Compression.SetType(compression.Uncompressed)
-
-	// gzip compressed
-	testAppRev.Spec.Compression.SetType(compression.Gzip)
-	gzipcomp, gzipsize := marshalAndUnmarshal(testAppRev)
-	gzipcomp.Spec.Compression.SetType(compression.Uncompressed)
-
-	assert.Equal(t, uncomp, zstdcomp)
-	assert.Equal(t, zstdcomp, gzipcomp)
-
-	assert.Less(t, zstdsize, uncompsize)
-	assert.Less(t, gzipsize, uncompsize)
-}

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

@@ -20,7 +20,6 @@ import (
 	"reflect"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
@@ -134,7 +133,6 @@ func init() {
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})
 	SchemeBuilder.Register(&ResourceTracker{}, &ResourceTrackerList{})
-	_ = SchemeBuilder.AddToScheme(k8sscheme.Scheme)
 }
 
 // Resource takes an unqualified resource and returns a Group qualified GroupResource

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

@@ -29,12 +29,11 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/kubevela/pkg/util/compression"
-
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/apis/interfaces"
 	velatypes "github.com/oam-dev/kubevela/apis/types"
 	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/utils/compression"
 	velaerr "github.com/oam-dev/kubevela/pkg/utils/errors"
 )
 
@@ -77,9 +76,10 @@ type ResourceTrackerSpec struct {
 	Compression           ResourceTrackerCompression `json:"compression,omitempty"`
 }
 
-// ResourceTrackerCompression represents the compressed components in ResourceTracker.
+// ResourceTrackerCompression the compression for ResourceTracker ManagedResources
 type ResourceTrackerCompression struct {
-	compression.CompressedText `json:",inline"`
+	Type compression.Type `json:"type,omitempty"`
+	Data string           `json:"data,omitempty"`
 }
 
 // MarshalJSON will encode ResourceTrackerSpec according to the compression type. If type specified,
@@ -88,19 +88,30 @@ type ResourceTrackerCompression struct {
 func (in *ResourceTrackerSpec) MarshalJSON() ([]byte, error) {
 	type Alias ResourceTrackerSpec
 	tmp := &struct{ *Alias }{}
-
-	if in.Compression.Type == compression.Uncompressed {
+	switch in.Compression.Type {
+	case compression.Uncompressed:
 		tmp.Alias = (*Alias)(in)
-	} else {
+	case compression.Gzip:
 		cpy := in.DeepCopy()
-		cpy.ManagedResources = nil
-		err := cpy.Compression.EncodeFrom(in.ManagedResources)
+		data, err := compression.GzipObjectToString(in.ManagedResources)
 		if err != nil {
 			return nil, err
 		}
+		cpy.ManagedResources = nil
+		cpy.Compression.Data = data
 		tmp.Alias = (*Alias)(cpy)
+	case compression.Zstd:
+		cpy := in.DeepCopy()
+		data, err := compression.ZstdObjectToString(in.ManagedResources)
+		if err != nil {
+			return nil, err
+		}
+		cpy.ManagedResources = nil
+		cpy.Compression.Data = data
+		tmp.Alias = (*Alias)(cpy)
+	default:
+		return nil, compression.NewUnsupportedCompressionTypeError(string(in.Compression.Type))
 	}
-
 	return json.Marshal(tmp.Alias)
 }
 
@@ -113,16 +124,24 @@ func (in *ResourceTrackerSpec) UnmarshalJSON(src []byte) error {
 	if err := json.Unmarshal(src, tmp); err != nil {
 		return err
 	}
-
-	if tmp.Compression.Type != compression.Uncompressed {
+	switch tmp.Compression.Type {
+	case compression.Uncompressed:
+		break
+	case compression.Gzip:
 		tmp.ManagedResources = []ManagedResource{}
-		err := tmp.Compression.DecodeTo(&tmp.ManagedResources)
-		if err != nil {
+		if err := compression.GunzipStringToObject(tmp.Compression.Data, &tmp.ManagedResources); err != nil {
 			return err
 		}
-		tmp.Compression.Clean()
+		tmp.Compression.Data = ""
+	case compression.Zstd:
+		tmp.ManagedResources = []ManagedResource{}
+		if err := compression.UnZstdStringToObject(tmp.Compression.Data, &tmp.ManagedResources); err != nil {
+			return err
+		}
+		tmp.Compression.Data = ""
+	default:
+		return compression.NewUnsupportedCompressionTypeError(string(in.Compression.Type))
 	}
-
 	(*ResourceTrackerSpec)(tmp.Alias).DeepCopyInto(in)
 	return nil
 }

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

@@ -19,12 +19,11 @@ package v1beta1
 import (
 	"encoding/json"
 	"fmt"
-	"os"
+	"io/ioutil"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/kubevela/pkg/util/compression"
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -35,6 +34,7 @@ import (
 
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/common"
 	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/utils/compression"
 	"github.com/oam-dev/kubevela/pkg/utils/errors"
 )
 
@@ -205,13 +205,14 @@ func TestResourceTrackerCompression(t *testing.T) {
 		"../../../charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml",
 		"../../../charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml",
 		"../../../charts/vela-core/crds/standard.oam.dev_rollouts.yaml",
+		"../../../charts/vela-core/templates/addon/fluxcd.yaml",
 		"../../../charts/vela-core/templates/kubevela-controller.yaml",
 		"../../../charts/vela-core/README.md",
 		"../../../pkg/velaql/providers/query/testdata/machinelearning.seldon.io_seldondeployments.yaml",
 		"../../../legacy/charts/vela-core-legacy/crds/standard.oam.dev_podspecworkloads.yaml",
 	}
 	for _, p := range paths {
-		b, err := os.ReadFile(p)
+		b, err := ioutil.ReadFile(p)
 		r.NoError(err)
 		data = append(data, string(b))
 	}

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

@@ -137,7 +137,39 @@ func (in *ApplicationRevision) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevisionCompressibleFields) DeepCopyInto(out *ApplicationRevisionCompressibleFields) {
+func (in *ApplicationRevisionList) DeepCopyInto(out *ApplicationRevisionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]ApplicationRevision, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionList.
+func (in *ApplicationRevisionList) DeepCopy() *ApplicationRevisionList {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationRevisionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ApplicationRevisionList) 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 *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
 	*out = *in
 	in.Application.DeepCopyInto(&out.Application)
 	if in.ComponentDefinitions != nil {
@@ -210,71 +242,6 @@ func (in *ApplicationRevisionCompressibleFields) DeepCopyInto(out *ApplicationRe
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionCompressibleFields.
-func (in *ApplicationRevisionCompressibleFields) DeepCopy() *ApplicationRevisionCompressibleFields {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevisionCompressibleFields)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevisionCompression) DeepCopyInto(out *ApplicationRevisionCompression) {
-	*out = *in
-	out.CompressedText = in.CompressedText
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionCompression.
-func (in *ApplicationRevisionCompression) DeepCopy() *ApplicationRevisionCompression {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevisionCompression)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ApplicationRevisionList) DeepCopyInto(out *ApplicationRevisionList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ApplicationRevision, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionList.
-func (in *ApplicationRevisionList) DeepCopy() *ApplicationRevisionList {
-	if in == nil {
-		return nil
-	}
-	out := new(ApplicationRevisionList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ApplicationRevisionList) 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 *ApplicationRevisionSpec) DeepCopyInto(out *ApplicationRevisionSpec) {
-	*out = *in
-	in.ApplicationRevisionCompressibleFields.DeepCopyInto(&out.ApplicationRevisionCompressibleFields)
-	out.Compression = in.Compression
-}
-
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationRevisionSpec.
 func (in *ApplicationRevisionSpec) DeepCopy() *ApplicationRevisionSpec {
 	if in == nil {
@@ -293,13 +260,6 @@ func (in *ApplicationRevisionStatus) DeepCopyInto(out *ApplicationRevisionStatus
 		*out = new(common.WorkflowStatus)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.WorkflowContext != nil {
-		in, out := &in.WorkflowContext, &out.WorkflowContext
-		*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 ApplicationRevisionStatus.
@@ -694,7 +654,6 @@ func (in *ResourceTracker) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ResourceTrackerCompression) DeepCopyInto(out *ResourceTrackerCompression) {
 	*out = *in
-	out.CompressedText = in.CompressedText
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceTrackerCompression.

apis/types/componentmanifest.go

@@ -28,11 +28,9 @@ type ComponentManifest struct {
 	RevisionName     string
 	RevisionHash     string
 	ExternalRevision string
-	// StandardWorkload contains K8s resource generated from "output" block of ComponentDefinition
 	StandardWorkload *unstructured.Unstructured
-	// Traits contains both resources generated from "outputs" block of ComponentDefinition and resources generated from TraitDefinition
-	Traits []*unstructured.Unstructured
-	Scopes []*corev1.ObjectReference
+	Traits           []*unstructured.Unstructured
+	Scopes           []*corev1.ObjectReference
 
 	// PackagedWorkloadResources contain all the workload related resources. It could be a Helm
 	// Release, Git Repo or anything that can package and run a workload.

charts/vela-core/README.md

@@ -41,12 +41,13 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | Name                          | Description                                                                                   | Value     |
 | ----------------------------- | --------------------------------------------------------------------------------------------- | --------- |
 | `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`     |
-| `applicationRevisionLimit`    | Application revision limit                                                                    | `2`       |
-| `definitionRevisionLimit`     | Definition revision limit                                                                     | `2`       |
+| `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`     |
 
 
@@ -80,26 +81,23 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 
 ### KubeVela controller optimization parameters
 
-| Name                                              | Description                                                                                                                                                                                                                      | Value   |
-| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `optimize.cachedGvks`                             | Optimize types of resources to be cached.                                                                                                                                                                                        | `""`    |
-| `optimize.resourceTrackerListOp`                  | Optimize ResourceTracker List Op by adding index.                                                                                                                                                                                | `true`  |
-| `optimize.controllerReconcileLoopReduction`       | Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.                                                                                                                               | `false` |
-| `optimize.markWithProb`                           | Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately.                                                                                | `0.1`   |
-| `optimize.disableComponentRevision`               | Optimize componentRevision by disabling the creation and gc                                                                                                                                                                      | `true`  |
-| `optimize.disableApplicationRevision`             | Optimize ApplicationRevision by disabling the creation and gc.                                                                                                                                                                   | `false` |
-| `optimize.disableWorkflowRecorder`                | Optimize workflow recorder by disabling the creation and gc.                                                                                                                                                                     | `false` |
-| `optimize.enableInMemoryWorkflowContext`          | Optimize workflow by use in-memory context.                                                                                                                                                                                      | `false` |
-| `optimize.disableResourceApplyDoubleCheck`        | Optimize workflow by ignoring resource double check after apply.                                                                                                                                                                 | `false` |
-| `optimize.enableResourceTrackerDeleteOnlyTrigger` | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                                                                                                              | `true`  |
-| `featureGates.enableLegacyComponentRevision`      | if disabled, only component with rollout trait will create component revisions                                                                                                                                                   | `false` |
-| `featureGates.gzipResourceTracker`                | compress ResourceTracker using gzip (good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers.                                                                                      | `false` |
-| `featureGates.zstdResourceTracker`                | compress ResourceTracker using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers. Note that zstd will be prioritized if you enable other compression options. | `true`  |
-| `featureGates.applyOnce`                          | if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker                                                                                            | `false` |
-| `featureGates.multiStageComponentApply`           | if enabled, the multiStageComponentApply feature will be combined with the stage field in TraitDefinition to complete the multi-stage apply.                                                                                     | `false` |
-| `featureGates.gzipApplicationRevision`            | compress apprev using gzip (good) before being stored. This is reduces network throughput when dealing with huge apprevs.                                                                                                        | `false` |
-| `featureGates.zstdApplicationRevision`            | compress apprev using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge apprevs. Note that zstd will be prioritized if you enable other compression options.                   | `true`  |
-| `featureGates.preDispatchDryRun`                  | enable dryrun before dispatching resources. Enable this flag can help prevent unsuccessful dispatch resources entering resourcetracker and improve the user experiences of gc but at the cost of increasing network requests.    | `true`  |
+| Name                                              | Description                                                                                                                                                                          | Value   |
+| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
+| `optimize.cachedGvks`                             | Optimize types of resources to be cached.                                                                                                                                            | `""`    |
+| `optimize.resourceTrackerListOp`                  | Optimize ResourceTracker List Op by adding index.                                                                                                                                    | `true`  |
+| `optimize.controllerReconcileLoopReduction`       | Optimize ApplicationController reconcile by reducing the number of loops to reconcile application.                                                                                   | `false` |
+| `optimize.markWithProb`                           | Optimize ResourceTracker GC by only run mark with probability. Side effect: outdated ResourceTracker might not be able to be removed immediately.                                    | `0.1`   |
+| `optimize.disableComponentRevision`               | Optimize componentRevision by disabling the creation and gc                                                                                                                          | `false` |
+| `optimize.disableApplicationRevision`             | Optimize ApplicationRevision by disabling the creation and gc.                                                                                                                       | `false` |
+| `optimize.disableWorkflowRecorder`                | Optimize workflow recorder by disabling the creation and gc.                                                                                                                         | `false` |
+| `optimize.enableInMemoryWorkflowContext`          | Optimize workflow by use in-memory context.                                                                                                                                          | `false` |
+| `optimize.disableResourceApplyDoubleCheck`        | Optimize workflow by ignoring resource double check after apply.                                                                                                                     | `false` |
+| `optimize.enableResourceTrackerDeleteOnlyTrigger` | Optimize resourcetracker by only trigger reconcile when resourcetracker is deleted.                                                                                                  | `true`  |
+| `featureGates.enableLegacyComponentRevision`      | if disabled, only component with rollout trait will create component revisions                                                                                                       | `false` |
+| `featureGates.gzipResourceTracker`                | if enabled, resourceTracker will be compressed using gzip before being stored                                                                                                        | `false` |
+| `featureGates.zstdResourceTracker`                | if enabled, resourceTracker will be compressed using zstd before being stored. It is much faster and more efficient than gzip. If both gzip and zstd are enabled, zstd will be used. | `false` |
+| `featureGates.applyOnce`                          | if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker                                                | `false` |
+| `featureGates.multiStageComponentApply`           | if enabled, the multiStageComponentApply feature will be combined with the stage field in TraitDefinition to complete the multi-stage apply.                                         | `false` |
 
 
 ### MultiCluster parameters
@@ -111,7 +109,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `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.7.0`                         |
+| `multicluster.clusterGateway.image.tag`                     | ClusterGateway image tag                        | `v1.4.0`                         |
 | `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`                          |
@@ -147,10 +145,10 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `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 100                                                                              | `100`                |
-| `kubeClient.burst`            | The burst for reconcile clients, default is 200                                                                            | `200`                |
+| `kubeClient.qps`              | The qps for reconcile clients, default is 50                                                                               | `50`                 |
+| `kubeClient.burst`            | The burst for reconcile clients, default is 100                                                                            | `100`                |
 | `authentication.enabled`      | Enable authentication for application                                                                                      | `false`              |
-| `authentication.withUser`     | Application authentication will impersonate as the request User                                                            | `true`               |
+| `authentication.withUser`     | Application authentication will impersonate as the request User                                                            | `false`              |
 | `authentication.defaultUser`  | Application authentication will impersonate as the User if no user provided in Application                                 | `kubevela:vela-core` |
 | `authentication.groupPattern` | Application authentication will impersonate as the request Group that matches the pattern                                  | `kubevela:*`         |
 

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: applicationrevisions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -213,7 +214,6 @@ spec:
                                         https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                       type: string
                                   type: object
-                                  x-kubernetes-map-type: atomic
                               required:
                               - name
                               type: object
@@ -356,7 +356,6 @@ spec:
                                               info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                             type: string
                                         type: object
-                                        x-kubernetes-map-type: atomic
                                     required:
                                     - name
                                     type: object
@@ -495,7 +494,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                         type: array
                       components:
                         description: Components record the related Components created
@@ -504,30 +502,30 @@ spec:
                           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
+                            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
+                            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. \n 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
+                            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. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                             ."
                           properties:
                             apiVersion:
@@ -565,7 +563,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                         type: array
                       conditions:
                         description: Conditions of the resource.
@@ -666,32 +663,32 @@ spec:
                                   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
+                                  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
+                                  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. \n
-                                  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
+                                  \    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. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                                   ."
                                 properties:
                                   apiVersion:
@@ -735,7 +732,6 @@ spec:
                                       https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                     type: string
                                 type: object
-                                x-kubernetes-map-type: atomic
                               type: array
                             traits:
                               items:
@@ -783,30 +779,31 @@ spec:
                             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
+                              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
+                              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. \n 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
+                              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. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
+                              on your reference. For example, ServiceReferences for
+                              admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                               ."
                             properties:
                               apiVersion:
@@ -845,7 +842,6 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                            x-kubernetes-map-type: atomic
                           endTime:
                             format: date-time
                             nullable: true
@@ -1150,21 +1146,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -1600,21 +1581,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -1948,21 +1914,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -2170,6 +2121,7 @@ spec:
                                     type: string
                                 required:
                                 - from
+                                - parameterKey
                                 type: object
                               type: array
                             name:
@@ -2291,6 +2243,7 @@ spec:
                                         type: string
                                     required:
                                     - from
+                                    - parameterKey
                                     type: object
                                   type: array
                                 meta:
@@ -2347,6 +2300,7 @@ spec:
                                               type: string
                                           required:
                                           - from
+                                          - parameterKey
                                           type: object
                                         type: array
                                       meta:
@@ -2388,6 +2342,7 @@ spec:
                                           step.
                                         type: string
                                     required:
+                                    - name
                                     - type
                                     type: object
                                   type: array
@@ -2398,6 +2353,7 @@ spec:
                                   description: Type is the type of the workflow step.
                                   type: string
                               required:
+                              - name
                               - type
                               type: object
                             type: array
@@ -2454,7 +2410,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                         type: array
                       components:
                         description: Components record the related Components created
@@ -2463,30 +2418,30 @@ spec:
                           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
+                            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
+                            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. \n 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
+                            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. \n Instead
+                            of using this type, create a locally provided and used
+                            type that is well-focused on your reference. For example,
+                            ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                             ."
                           properties:
                             apiVersion:
@@ -2524,7 +2479,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                         type: array
                       conditions:
                         description: Conditions of the resource.
@@ -2625,32 +2579,32 @@ spec:
                                   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
+                                  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
+                                  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. \n
-                                  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
+                                  \    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. \n Instead of using this type, create
+                                  a locally provided and used type that is well-focused
+                                  on your reference. For example, ServiceReferences
+                                  for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                                   ."
                                 properties:
                                   apiVersion:
@@ -2694,7 +2648,6 @@ spec:
                                       https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                     type: string
                                 type: object
-                                x-kubernetes-map-type: atomic
                               type: array
                             traits:
                               items:
@@ -2742,30 +2695,31 @@ spec:
                             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
+                              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
+                              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. \n 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
+                              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. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
+                              on your reference. For example, ServiceReferences for
+                              admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                               ."
                             properties:
                               apiVersion:
@@ -2804,7 +2758,6 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                            x-kubernetes-map-type: atomic
                           endTime:
                             format: date-time
                             nullable: true
@@ -3102,21 +3055,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -3263,16 +3201,6 @@ spec:
                 description: ComponentDefinitions records the snapshot of the componentDefinitions
                   related with the created/modified Application
                 type: object
-              compression:
-                description: Compression represents the compressed components in apprev
-                  in base64 (if compression is enabled).
-                properties:
-                  data:
-                    type: string
-                  type:
-                    description: Type the compression type
-                    type: string
-                type: object
               policies:
                 additionalProperties:
                   description: Policy is the Schema for the policy API
@@ -3487,21 +3415,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -3929,21 +3842,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -4147,6 +4045,7 @@ spec:
                                 type: string
                             required:
                             - from
+                            - parameterKey
                             type: object
                           type: array
                         meta:
@@ -4198,6 +4097,7 @@ spec:
                                       type: string
                                   required:
                                   - from
+                                  - parameterKey
                                   type: object
                                 type: array
                               meta:
@@ -4235,6 +4135,7 @@ spec:
                                 description: Type is the type of the workflow step.
                                 type: string
                             required:
+                            - name
                             - type
                             type: object
                           type: array
@@ -4245,6 +4146,7 @@ spec:
                           description: Type is the type of the workflow step.
                           type: string
                       required:
+                      - name
                       - type
                       type: object
                     type: array
@@ -4413,21 +4315,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -4744,21 +4631,6 @@ spec:
                                     provisioned cloud resources will be deleted when
                                     CR is deleted
                                   type: boolean
-                                gitCredentialsSecretReference:
-                                  description: GitCredentialsSecretReference specifies
-                                    the reference to the secret containing the git
-                                    credentials
-                                  properties:
-                                    name:
-                                      description: name is unique within a namespace
-                                        to reference a secret resource.
-                                      type: string
-                                    namespace:
-                                      description: namespace defines the space within
-                                        which the secret name must be unique.
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
                                 path:
                                   description: Path is the sub-directory of remote
                                     git repository. It's valid when remote is set
@@ -4885,27 +4757,28 @@ spec:
                     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
+                      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.
+                      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. \n 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
+                      \    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. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                       ."
                     properties:
                       apiVersion:
@@ -4941,7 +4814,6 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                    x-kubernetes-map-type: atomic
                   endTime:
                     format: date-time
                     nullable: true
@@ -5045,11 +4917,6 @@ spec:
                 - suspend
                 - terminated
                 type: object
-              workflowContext:
-                additionalProperties:
-                  type: string
-                description: Record the context values to the revision.
-                type: object
             required:
             - succeeded
             type: object
@@ -5058,3 +4925,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: vela-system/kubevela-vela-core-root-cert
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: applications.core.oam.dev
 spec:
   group: core.oam.dev
@@ -178,7 +178,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                       required:
                       - name
                       type: object
@@ -313,7 +312,6 @@ spec:
                                       https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                     type: string
                                 type: object
-                                x-kubernetes-map-type: atomic
                             required:
                             - name
                             type: object
@@ -447,7 +445,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
               components:
                 description: Components record the related Components created by Application
@@ -456,27 +453,27 @@ spec:
                   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
+                    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. \n 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
+                    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. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                     ."
                   properties:
                     apiVersion:
@@ -512,7 +509,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
               conditions:
                 description: Conditions of the resource.
@@ -608,29 +604,29 @@ spec:
                         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
+                          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.
+                          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
+                          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. \n
-                          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
+                          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.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                           ."
                         properties:
                           apiVersion:
@@ -667,7 +663,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                        x-kubernetes-map-type: atomic
                       type: array
                     traits:
                       items:
@@ -715,27 +710,28 @@ spec:
                     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
+                      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.
+                      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. \n 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
+                      \    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. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                       ."
                     properties:
                       apiVersion:
@@ -771,7 +767,6 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                    x-kubernetes-map-type: atomic
                   endTime:
                     format: date-time
                     nullable: true
@@ -941,6 +936,7 @@ spec:
                             type: string
                         required:
                         - from
+                        - parameterKey
                         type: object
                       type: array
                     name:
@@ -1057,6 +1053,7 @@ spec:
                                 type: string
                             required:
                             - from
+                            - parameterKey
                             type: object
                           type: array
                         meta:
@@ -1108,6 +1105,7 @@ spec:
                                       type: string
                                   required:
                                   - from
+                                  - parameterKey
                                   type: object
                                 type: array
                               meta:
@@ -1145,6 +1143,7 @@ spec:
                                 description: Type is the type of the workflow step.
                                 type: string
                             required:
+                            - name
                             - type
                             type: object
                           type: array
@@ -1155,6 +1154,7 @@ spec:
                           description: Type is the type of the workflow step.
                           type: string
                       required:
+                      - name
                       - type
                       type: object
                     type: array
@@ -1209,7 +1209,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
               components:
                 description: Components record the related Components created by Application
@@ -1218,27 +1217,27 @@ spec:
                   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
+                    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. \n 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
+                    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. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                     ."
                   properties:
                     apiVersion:
@@ -1274,7 +1273,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
               conditions:
                 description: Conditions of the resource.
@@ -1370,29 +1368,29 @@ spec:
                         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
+                          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.
+                          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
+                          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. \n
-                          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
+                          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.
+                          \n Instead of using this type, create a locally provided
+                          and used type that is well-focused on your reference. For
+                          example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                           ."
                         properties:
                           apiVersion:
@@ -1429,7 +1427,6 @@ spec:
                             description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                             type: string
                         type: object
-                        x-kubernetes-map-type: atomic
                       type: array
                     traits:
                       items:
@@ -1477,27 +1474,28 @@ spec:
                     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
+                      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.
+                      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. \n 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
+                      \    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. \n Instead of using this type, create a
+                      locally provided and used type that is well-focused on your
+                      reference. For example, ServiceReferences for admission registration:
+                      https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                       ."
                     properties:
                       apiVersion:
@@ -1533,7 +1531,6 @@ spec:
                         description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                         type: string
                     type: object
-                    x-kubernetes-map-type: atomic
                   endTime:
                     format: date-time
                     nullable: true
@@ -1643,3 +1640,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: componentdefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -187,20 +188,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -514,20 +501,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -672,3 +645,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: definitionrevisions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -232,20 +233,6 @@ spec:
                                   provisioned cloud resources will be deleted when
                                   CR is deleted
                                 type: boolean
-                              gitCredentialsSecretReference:
-                                description: GitCredentialsSecretReference specifies
-                                  the reference to the secret containing the git credentials
-                                properties:
-                                  name:
-                                    description: name is unique within a namespace
-                                      to reference a secret resource.
-                                    type: string
-                                  namespace:
-                                    description: namespace defines the space within
-                                      which the secret name must be unique.
-                                    type: string
-                                type: object
-                                x-kubernetes-map-type: atomic
                               path:
                                 description: Path is the sub-directory of remote git
                                   repository. It's valid when remote is set
@@ -563,20 +550,6 @@ spec:
                                   provisioned cloud resources will be deleted when
                                   CR is deleted
                                 type: boolean
-                              gitCredentialsSecretReference:
-                                description: GitCredentialsSecretReference specifies
-                                  the reference to the secret containing the git credentials
-                                properties:
-                                  name:
-                                    description: name is unique within a namespace
-                                      to reference a secret resource.
-                                    type: string
-                                  namespace:
-                                    description: namespace defines the space within
-                                      which the secret name must be unique.
-                                    type: string
-                                type: object
-                                x-kubernetes-map-type: atomic
                               path:
                                 description: Path is the sub-directory of remote git
                                   repository. It's valid when remote is set
@@ -895,20 +868,6 @@ spec:
                                   provisioned cloud resources will be deleted when
                                   CR is deleted
                                 type: boolean
-                              gitCredentialsSecretReference:
-                                description: GitCredentialsSecretReference specifies
-                                  the reference to the secret containing the git credentials
-                                properties:
-                                  name:
-                                    description: name is unique within a namespace
-                                      to reference a secret resource.
-                                    type: string
-                                  namespace:
-                                    description: namespace defines the space within
-                                      which the secret name must be unique.
-                                    type: string
-                                type: object
-                                x-kubernetes-map-type: atomic
                               path:
                                 description: Path is the sub-directory of remote git
                                   repository. It's valid when remote is set
@@ -1202,20 +1161,6 @@ spec:
                                   provisioned cloud resources will be deleted when
                                   CR is deleted
                                 type: boolean
-                              gitCredentialsSecretReference:
-                                description: GitCredentialsSecretReference specifies
-                                  the reference to the secret containing the git credentials
-                                properties:
-                                  name:
-                                    description: name is unique within a namespace
-                                      to reference a secret resource.
-                                    type: string
-                                  namespace:
-                                    description: namespace defines the space within
-                                      which the secret name must be unique.
-                                    type: string
-                                type: object
-                                x-kubernetes-map-type: atomic
                               path:
                                 description: Path is the sub-directory of remote git
                                   repository. It's valid when remote is set
@@ -1334,3 +1279,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: healthscopes.core.oam.dev
 spec:
   group: core.oam.dev
@@ -62,31 +63,31 @@ spec:
                                 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
+                                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
+                                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.
-                                \n 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
+                                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. \n Instead of using
+                                this type, create a locally provided and used type
+                                that is well-focused on your reference. For example,
+                                ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                                 ."
                               properties:
                                 apiVersion:
@@ -126,36 +127,36 @@ spec:
                                   description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                   type: string
                               type: object
-                              x-kubernetes-map-type: atomic
                             type: array
                           workload:
                             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
+                              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
+                              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. \n 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
+                              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. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
+                              on your reference. For example, ServiceReferences for
+                              admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                               ."
                             properties:
                               apiVersion:
@@ -194,7 +195,6 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                            x-kubernetes-map-type: atomic
                         type: object
                       type: array
                   type: object
@@ -216,27 +216,27 @@ spec:
                   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
+                    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. \n 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
+                    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. \n
+                    Instead of using this type, create a locally provided and used
+                    type that is well-focused on your reference. For example, ServiceReferences
+                    for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                     ."
                   properties:
                     apiVersion:
@@ -272,7 +272,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
             required:
             - workloadRefs
@@ -309,30 +308,31 @@ spec:
                             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
+                              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
+                              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. \n 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
+                              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. \n Instead of using this type,
+                              create a locally provided and used type that is well-focused
+                              on your reference. For example, ServiceReferences for
+                              admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                               ."
                             properties:
                               apiVersion:
@@ -371,7 +371,6 @@ spec:
                                 description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                 type: string
                             type: object
-                            x-kubernetes-map-type: atomic
                           traits:
                             items:
                               description: TraitHealthCondition represents informative
@@ -465,28 +464,29 @@ spec:
                       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
+                        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
+                        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. \n 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
+                        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. \n Instead of using this type, create
+                        a locally provided and used type that is well-focused on your
+                        reference. For example, ServiceReferences for admission registration:
+                        https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
                         ."
                       properties:
                         apiVersion:
@@ -523,7 +523,6 @@ spec:
                           description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                           type: string
                       type: object
-                      x-kubernetes-map-type: atomic
                     traits:
                       items:
                         description: TraitHealthCondition represents informative health
@@ -584,3 +583,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: policies.core.oam.dev
 spec:
   group: core.oam.dev
@@ -48,3 +49,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: policydefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -160,20 +161,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -284,3 +271,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: resourcetrackers.core.oam.dev
 spec:
   group: core.oam.dev
@@ -56,8 +57,8 @@ spec:
                 format: int64
                 type: integer
               compression:
-                description: ResourceTrackerCompression represents the compressed
-                  components in ResourceTracker.
+                description: ResourceTrackerCompression the compression for ResourceTracker
+                  ManagedResources
                 properties:
                   data:
                     type: string
@@ -122,7 +123,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
               type:
                 description: ResourceTrackerType defines the type of resourceTracker
@@ -177,7 +177,6 @@ spec:
                       description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                       type: string
                   type: object
-                  x-kubernetes-map-type: atomic
                 type: array
             type: object
         type: object
@@ -185,3 +184,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: scopedefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -144,3 +145,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: traitdefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -196,20 +197,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -524,20 +511,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -671,3 +644,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workflowstepdefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -157,20 +158,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -281,3 +268,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: workloaddefinitions.core.oam.dev
 spec:
   group: core.oam.dev
@@ -201,20 +202,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -505,20 +492,6 @@ spec:
                         description: DeleteResource will determine whether provisioned
                           cloud resources will be deleted when CR is deleted
                         type: boolean
-                      gitCredentialsSecretReference:
-                        description: GitCredentialsSecretReference specifies the reference
-                          to the secret containing the git credentials
-                        properties:
-                          name:
-                            description: name is unique within a namespace to reference
-                              a secret resource.
-                            type: string
-                          namespace:
-                            description: namespace defines the space within which
-                              the secret name must be unique.
-                            type: string
-                        type: object
-                        x-kubernetes-map-type: atomic
                       path:
                         description: Path is the sub-directory of remote git repository.
                           It's valid when remote is set
@@ -623,3 +596,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,10 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.6.2
   name: rollouts.standard.oam.dev
 spec:
   group: standard.oam.dev
@@ -139,7 +140,6 @@ spec:
                               description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                               type: string
                           type: object
-                          x-kubernetes-map-type: atomic
                       required:
                       - name
                       type: object
@@ -274,7 +274,6 @@ spec:
                                       https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                                     type: string
                                 type: object
-                                x-kubernetes-map-type: atomic
                             required:
                             - name
                             type: object
@@ -475,3 +474,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/vela-core/templates/addon/fluxcd-def.yaml

@@ -0,0 +1,270 @@
+{{- 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 }}

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

@@ -32,7 +32,6 @@ spec:
             - "--secure-port={{ .Values.multicluster.clusterGateway.port }}"
             - "--secret-namespace={{ .Release.Namespace }}"
             - "--feature-gates=APIPriorityAndFairness=false,ClientIdentityPenetration={{ .Values.authentication.enabled }}"
-            - "--cluster-gateway-proxy-config=/etc/proxy-config/config.yaml"
             {{- if .Values.multicluster.clusterGateway.secureTLS.enabled }}
             - "--tls-cert-file={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}/tls.crt"
             - "--tls-private-key-file={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}/tls.key"
@@ -43,20 +42,14 @@ spec:
           {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
           ports:
             - containerPort: {{ .Values.multicluster.clusterGateway.port }}
-          volumeMounts:
-            - mountPath: /etc/proxy-config
-              name: proxy-config
           {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
+          volumeMounts:
             - mountPath: {{ .Values.multicluster.clusterGateway.secureTLS.certPath }}
               name: tls-cert-vol
               readOnly: true
           {{- end }}
-      volumes:
-        - configMap:
-            defaultMode: 420
-            name: {{ .Release.Name }}-cluster-gateway-proxy-config
-          name: proxy-config
       {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
+      volumes:
         - name: tls-cert-vol
           secret:
             defaultMode: 420
@@ -81,23 +74,6 @@ spec:
       maxUnavailable: 1
 ---
 apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-cluster-gateway-proxy-config
-  namespace: {{ .Release.Namespace }}
-data:
-  config.yaml: |
-    apiVersion: cluster.core.oam.dev/v1alpha1
-    kind: ClusterGatewayProxyConfiguration
-    spec:
-      clientIdentityExchanger:
-        rules:
-          - name: super-user
-            source:
-              group: kubevela:ux
-            type: PrivilegedIdentityExchanger
----
-apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-cluster-gateway-service

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

@@ -7,6 +7,7 @@ metadata:
     definition.oam.dev/description: Apply a specific component and its corresponding traits in application
   labels:
     custom.definition.oam.dev/scope: Application
+    custom.definition.oam.dev/ui-hidden: "true"
   name: apply-component
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -1,51 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/apply-deployment.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Apply deployment with specified image and cmd.
-  name: apply-deployment
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"strconv"
-        	"strings"
-        	"vela/op"
-        )
-
-        output: op.#Apply & {
-        	value: {
-        		apiVersion: "apps/v1"
-        		kind:       "Deployment"
-        		metadata: {
-        			name:      context.stepName
-        			namespace: context.namespace
-        		}
-        		spec: {
-        			selector: matchLabels: "workflow.oam.dev/step-name": "\(context.name)-\(context.stepName)"
-        			template: {
-        				metadata: labels: "workflow.oam.dev/step-name": "\(context.name)-\(context.stepName)"
-        				spec: containers: [{
-        					name:  context.stepName
-        					image: parameter.image
-        					if parameter["cmd"] != _|_ {
-        						command: parameter.cmd
-        					}
-        				}]
-        			}
-        		}
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: output.value.status.readyReplicas == 1
-        }
-        parameter: {
-        	image: string
-        	cmd?: [...string]
-        }
-

charts/vela-core/templates/defwithtemplate/apply-terraform-config.yaml

@@ -1,91 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/apply-terraform-config.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Apply terraform configuration in the step
-    definition.oam.dev/example-url: https://raw.githubusercontent.com/kubevela/workflow/main/examples/workflow-run/apply-terraform-resource.yaml
-  name: apply-terraform-config
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        apply: op.#Apply & {
-        	value: {
-        		apiVersion: "terraform.core.oam.dev/v1beta2"
-        		kind:       "Configuration"
-        		metadata: {
-        			name:      "\(context.name)-\(context.stepName)"
-        			namespace: context.namespace
-        		}
-        		spec: {
-        			deleteResource: parameter.deleteResource
-        			variable:       parameter.variable
-        			forceDelete:    parameter.forceDelete
-        			if parameter.source.path != _|_ {
-        				path: parameter.source.path
-        			}
-        			if parameter.source.remote != _|_ {
-        				remote: parameter.source.remote
-        			}
-        			if parameter.source.hcl != _|_ {
-        				hcl: parameter.source.hcl
-        			}
-        			if parameter.providerRef != _|_ {
-        				providerRef: parameter.providerRef
-        			}
-        			if parameter.jobEnv != _|_ {
-        				jobEnv: parameter.jobEnv
-        			}
-        			if parameter.writeConnectionSecretToRef != _|_ {
-        				writeConnectionSecretToRef: parameter.writeConnectionSecretToRef
-        			}
-        			if parameter.region != _|_ {
-        				region: parameter.region
-        			}
-        		}
-        	}
-        }
-        check: op.#ConditionalWait & {
-        	continue: apply.value.status != _|_ && apply.value.status.apply != _|_ && apply.value.status.apply.state == "Available"
-        }
-        parameter: {
-        	// +usage=specify the source of the terraform configuration
-        	source: close({
-        		// +usage=directly specify the hcl of the terraform configuration
-        		hcl: string
-        	}) | close({
-        		// +usage=specify the remote url of the terraform configuration
-        		remote: *"https://github.com/kubevela-contrib/terraform-modules.git" | string
-        		// +usage=specify the path of the terraform configuration
-        		path?: string
-        	})
-        	// +usage=whether to delete resource
-        	deleteResource: *true | bool
-        	// +usage=the variable in the configuration
-        	variable: {...}
-        	// +usage=this specifies the namespace and name of a secret to which any connection details for this managed resource should be written.
-        	writeConnectionSecretToRef?: {
-        		name:      string
-        		namespace: *context.namespace | string
-        	}
-        	// +usage=providerRef specifies the reference to Provider
-        	providerRef?: {
-        		name:      string
-        		namespace: *context.namespace | string
-        	}
-        	// +usage=region is cloud provider's region. It will override the region in the region field of providerRef
-        	region?: string
-        	// +usage=the envs for job
-        	jobEnv?: {...}
-        	// +usae=forceDelete will force delete Configuration no matter which state it is or whether it has provisioned some resources
-        	forceDelete: *false | bool
-        }
-

charts/vela-core/templates/defwithtemplate/apply-terraform-provider.yaml

@@ -1,144 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/apply-terraform-provider.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Apply terraform provider config
-    definition.oam.dev/example-url: https://raw.githubusercontent.com/kubevela/workflow/main/examples/workflow-run/apply-terraform-resource.yaml
-  name: apply-terraform-provider
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"strings"
-        )
-
-        config: op.#CreateConfig & {
-        	name:      "\(context.name)-\(context.stepName)"
-        	namespace: context.namespace
-        	template:  "terraform-\(parameter.type)"
-        	config: {
-        		name: parameter.name
-        		if parameter.type == "alibaba" {
-        			ALICLOUD_ACCESS_KEY: parameter.accessKey
-        			ALICLOUD_SECRET_KEY: parameter.secretKey
-        			ALICLOUD_REGION:     parameter.region
-        		}
-        		if parameter.type == "aws" {
-        			AWS_ACCESS_KEY_ID:     parameter.accessKey
-        			AWS_SECRET_ACCESS_KEY: parameter.secretKey
-        			AWS_DEFAULT_REGION:    parameter.region
-        			AWS_SESSION_TOKEN:     parameter.token
-        		}
-        		if parameter.type == "azure" {
-        			ARM_CLIENT_ID:       parameter.clientID
-        			ARM_CLIENT_SECRET:   parameter.clientSecret
-        			ARM_SUBSCRIPTION_ID: parameter.subscriptionID
-        			ARM_TENANT_ID:       parameter.tenantID
-        		}
-        		if parameter.type == "baidu" {
-        			BAIDUCLOUD_ACCESS_KEY: parameter.accessKey
-        			BAIDUCLOUD_SECRET_KEY: parameter.secretKey
-        			BAIDUCLOUD_REGION:     parameter.region
-        		}
-        		if parameter.type == "ec" {
-        			EC_API_KEY: parameter.apiKey
-        		}
-        		if parameter.type == "gcp" {
-        			GOOGLE_CREDENTIALS: parameter.credentials
-        			GOOGLE_REGION:      parameter.region
-        			GOOGLE_PROJECT:     parameter.project
-        		}
-        		if parameter.type == "tencent" {
-        			TENCENTCLOUD_SECRET_ID:  parameter.secretID
-        			TENCENTCLOUD_SECRET_KEY: parameter.secretKey
-        			TENCENTCLOUD_REGION:     parameter.region
-        		}
-        		if parameter.type == "ucloud" {
-        			UCLOUD_PRIVATE_KEY: parameter.privateKey
-        			UCLOUD_PUBLIC_KEY:  parameter.publicKey
-        			UCLOUD_PROJECT_ID:  parameter.projectID
-        			UCLOUD_REGION:      parameter.region
-        		}
-        	}
-        }
-        read: op.#Read & {
-        	value: {
-        		apiVersion: "terraform.core.oam.dev/v1beta1"
-        		kind:       "Provider"
-        		metadata: {
-        			name:      parameter.name
-        			namespace: context.namespace
-        		}
-        	}
-        }
-        check: op.#ConditionalWait & {
-        	if read.value.status != _|_ {
-        		continue: read.value.status.state == "ready"
-        	}
-        	if read.value.status == _|_ {
-        		continue: false
-        	}
-        }
-        providerBasic: {
-        	accessKey: string
-        	secretKey: string
-        	region:    string
-        }
-        #AlibabaProvider: {
-        	providerBasic
-        	type: "alibaba"
-        	name: *"alibaba-provider" | string
-        }
-        #AWSProvider: {
-        	providerBasic
-        	token: *"" | string
-        	type:  "aws"
-        	name:  *"aws-provider" | string
-        }
-        #AzureProvider: {
-        	subscriptionID: string
-        	tenantID:       string
-        	clientID:       string
-        	clientSecret:   string
-        	name:           *"azure-provider" | string
-        }
-        #BaiduProvider: {
-        	providerBasic
-        	type: "baidu"
-        	name: *"baidu-provider" | string
-        }
-        #ECProvider: {
-        	type:   "ec"
-        	apiKey: *"" | string
-        	name:   *"ec-provider" | string
-        }
-        #GCPProvider: {
-        	credentials: string
-        	region:      string
-        	project:     string
-        	type:        "gcp"
-        	name:        *"gcp-provider" | string
-        }
-        #TencentProvider: {
-        	secretID:  string
-        	secretKey: string
-        	region:    string
-        	type:      "tencent"
-        	name:      *"tencent-provider" | string
-        }
-        #UCloudProvider: {
-        	publicKey:  string
-        	privateKey: string
-        	projectID:  string
-        	region:     string
-        	type:       "ucloud"
-        	name:       *"ucloud-provider" | string
-        }
-        parameter: *#AlibabaProvider | #AWSProvider | #AzureProvider | #BaiduProvider | #ECProvider | #GCPProvider | #TencentProvider | #UCloudProvider
-

charts/vela-core/templates/defwithtemplate/build-push-image.yaml

@@ -1,158 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/build-push-image.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Build and push image from git url
-    definition.oam.dev/example-url: https://raw.githubusercontent.com/kubevela/workflow/main/examples/workflow-run/built-push-image.yaml
-  name: build-push-image
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/json"
-        	"strings"
-        )
-
-        url: {
-        	if parameter.context.git != _|_ {
-        		address: strings.TrimPrefix(parameter.context.git, "git://")
-        		value:   "git://\(address)#refs/heads/\(parameter.context.branch)"
-        	}
-        	if parameter.context.git == _|_ {
-        		value: parameter.context
-        	}
-        }
-        kaniko: op.#Apply & {
-        	value: {
-        		apiVersion: "v1"
-        		kind:       "Pod"
-        		metadata: {
-        			name:      "\(context.name)-\(context.stepSessionID)-kaniko"
-        			namespace: context.namespace
-        		}
-        		spec: {
-        			containers: [
-        				{
-        					args: [
-        						"--dockerfile=\(parameter.dockerfile)",
-        						"--context=\(url.value)",
-        						"--destination=\(parameter.image)",
-        						"--verbosity=\(parameter.verbosity)",
-        						if parameter.platform != _|_ {
-        							"--customPlatform=\(parameter.platform)"
-        						},
-        						if parameter.buildArgs != _|_ for arg in parameter.buildArgs {
-        							"--build-arg=\(arg)"
-        						},
-        					]
-        					image: parameter.kanikoExecutor
-        					name:  "kaniko"
-        					if parameter.credentials != _|_ && parameter.credentials.image != _|_ {
-        						volumeMounts: [
-        							{
-        								mountPath: "/kaniko/.docker/"
-        								name:      parameter.credentials.image.name
-        							},
-        						]
-        					}
-        					if parameter.credentials != _|_ && parameter.credentials.git != _|_ {
-        						env: [
-        							{
-        								name: "GIT_TOKEN"
-        								valueFrom: secretKeyRef: {
-        									key:  parameter.credentials.git.key
-        									name: parameter.credentials.git.name
-        								}
-        							},
-        						]
-        					}
-        				},
-        			]
-        			if parameter.credentials != _|_ && parameter.credentials.image != _|_ {
-        				volumes: [
-        					{
-        						name: parameter.credentials.image.name
-        						secret: {
-        							defaultMode: 420
-        							items: [
-        								{
-        									key:  parameter.credentials.image.key
-        									path: "config.json"
-        								},
-        							]
-        							secretName: parameter.credentials.image.name
-        						}
-        					},
-        				]
-        			}
-        			restartPolicy: "Never"
-        		}
-        	}
-        }
-        log: op.#Log & {
-        	source: resources: [{
-        		name:      "\(context.name)-\(context.stepSessionID)-kaniko"
-        		namespace: context.namespace
-        	}]
-        }
-        read: op.#Read & {
-        	value: {
-        		apiVersion: "v1"
-        		kind:       "Pod"
-        		metadata: {
-        			name:      "\(context.name)-\(context.stepSessionID)-kaniko"
-        			namespace: context.namespace
-        		}
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: read.value.status != _|_ && read.value.status.phase == "Succeeded"
-        }
-        #secret: {
-        	name: string
-        	key:  string
-        }
-        #git: {
-        	git:    string
-        	branch: *"master" | string
-        }
-        parameter: {
-        	// +usage=Specify the kaniko executor image, default to oamdev/kaniko-executor:v1.9.1
-        	kanikoExecutor: *"oamdev/kaniko-executor:v1.9.1" | string
-        	// +usage=Specify the context to build image, you can use context with git and branch or directly specify the context, please refer to https://github.com/GoogleContainerTools/kaniko#kaniko-build-contexts
-        	context: #git | string
-        	// +usage=Specify the dockerfile
-        	dockerfile: *"./Dockerfile" | string
-        	// +usage=Specify the image
-        	image: string
-        	// +usage=Specify the platform to build
-        	platform?: string
-        	// +usage=Specify the build args
-        	buildArgs?: [...string]
-        	// +usage=Specify the credentials to access git and image registry
-        	credentials?: {
-        		// +usage=Specify the credentials to access git
-        		git?: {
-        			// +usage=Specify the secret name
-        			name: string
-        			// +usage=Specify the secret key
-        			key: string
-        		}
-        		// +usage=Specify the credentials to access image registry
-        		image?: {
-        			// +usage=Specify the secret name
-        			name: string
-        			// +usage=Specify the secret key
-        			key: *".dockerconfigjson" | string
-        		}
-        	}
-        	// +usage=Specify the verbosity level
-        	verbosity: *"info" | "panic" | "fatal" | "error" | "warn" | "debug" | "trace"
-        }
-

charts/vela-core/templates/defwithtemplate/clean-jobs.yaml

@@ -1,60 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/clean-jobs.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: clean applied jobs in the cluster
-  name: clean-jobs
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        parameter: {
-        	labelselector?: {...}
-        	namespace: *context.namespace | string
-        }
-        cleanJobs: op.#Delete & {
-        	value: {
-        		apiVersion: "batch/v1"
-        		kind:       "Job"
-        		metadata: {
-        			name:      context.name
-        			namespace: parameter.namespace
-        		}
-        	}
-        	filter: {
-        		namespace: parameter.namespace
-        		if parameter.labelselector != _|_ {
-        			matchingLabels: parameter.labelselector
-        		}
-        		if parameter.labelselector == _|_ {
-        			matchingLabels: "workflow.oam.dev/name": context.name
-        		}
-        	}
-        }
-        cleanPods: op.#Delete & {
-        	value: {
-        		apiVersion: "v1"
-        		kind:       "pod"
-        		metadata: {
-        			name:      context.name
-        			namespace: parameter.namespace
-        		}
-        	}
-        	filter: {
-        		namespace: parameter.namespace
-        		if parameter.labelselector != _|_ {
-        			matchingLabels: parameter.labelselector
-        		}
-        		if parameter.labelselector == _|_ {
-        			matchingLabels: "workflow.oam.dev/name": context.name
-        		}
-        	}
-        }
-

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

@@ -72,7 +72,7 @@ spec:
         		}]
         	}
         }
-        parameter: #PatchParams | close({
+        parameter: *#PatchParams | close({
         	// +usage=Specify the container image for multiple containers
         	containers: [...#PatchParams]
         })

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Wait for the specified Application to complete.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: depends-on-app
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to specified Kubernetes ConfigMap in your workflow.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2config
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Export data to Kubernetes Secret in your workflow.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
@@ -13,43 +15,27 @@ spec:
       template: |
         import (
         	"vela/op"
-        	"encoding/base64"
-        	"encoding/json"
         )
 
-        secret: op.#Steps & {
-        	data: *parameter.data | {}
-        	if parameter.kind == "docker-registry" && parameter.dockerRegistry != _|_ {
-        		registryData: auths: "\(parameter.dockerRegistry.server)": {
-        			username: parameter.dockerRegistry.username
-        			password: parameter.dockerRegistry.password
-        			auth:     base64.Encode(null, "\(parameter.dockerRegistry.username):\(parameter.dockerRegistry.password)")
+        apply: op.#Apply & {
+        	value: {
+        		apiVersion: "v1"
+        		kind:       "Secret"
+        		if parameter.type != _|_ {
+        			type: parameter.type
         		}
-        		data: ".dockerconfigjson": json.Marshal(registryData)
-        	}
-        	apply: op.#Apply & {
-        		value: {
-        			apiVersion: "v1"
-        			kind:       "Secret"
-        			if parameter.type == _|_ && parameter.kind == "docker-registry" {
-        				type: "kubernetes.io/dockerconfigjson"
+        		metadata: {
+        			name: parameter.secretName
+        			if parameter.namespace != _|_ {
+        				namespace: parameter.namespace
         			}
-        			if parameter.type != _|_ {
-        				type: parameter.type
+        			if parameter.namespace == _|_ {
+        				namespace: context.namespace
         			}
-        			metadata: {
-        				name: parameter.secretName
-        				if parameter.namespace != _|_ {
-        					namespace: parameter.namespace
-        				}
-        				if parameter.namespace == _|_ {
-        					namespace: context.namespace
-        				}
-        			}
-        			stringData: data
         		}
-        		cluster: parameter.cluster
+        		stringData: parameter.data
         	}
+        	cluster: parameter.cluster
         }
         parameter: {
         	// +usage=Specify the name of the secret
@@ -62,16 +48,5 @@ spec:
         	data: {}
         	// +usage=Specify the cluster of the secret
         	cluster: *"" | string
-        	// +usage=Specify the kind of the secret
-        	kind: *"generic" | "docker-registry"
-        	// +usage=Specify the docker data
-        	dockerRegistry?: {
-        		// +usage=Specify the username of the docker registry
-        		username: string
-        		// +usage=Specify the password of the docker registry
-        		password: string
-        		// +usage=Specify the server of the docker registry
-        		server: *"https://index.docker.io/v1/" | string
-        	}
         }
 

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

@@ -53,10 +53,7 @@ spec:
       }
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: *false | bool
-      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
-      		isHealth: true
-      	}
+      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
       	if !isHealth {
       		message: "ExternalIP: Pending"
       	}
@@ -65,15 +62,10 @@ spec:
       	}
       }
     healthPolicy: |-
+      isHealth: *true | bool
       service: context.outputs.service
       if service.spec.type == "LoadBalancer" {
       	status: service.status
-      	isHealth: *false | bool
-      	if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 if status.loadBalancer.ingress[0].ip != _|_ {
-      		isHealth: true
-      	}
-      }
-      if service.spec.type != "LoadBalancer" {
-      	isHealth: true
+      	isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0
       }
 

charts/vela-core/templates/defwithtemplate/generate-jdbc-connection.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Generate a JDBC connection based on Component of alibaba-rds
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: generate-jdbc-connection
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -1,110 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/hpa.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure k8s HPA for Deployment or Statefulsets
-  name: hpa
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-  podDisruptive: false
-  schematic:
-    cue:
-      template: |
-        outputs: hpa: {
-        	if context.clusterVersion.minor < 23 {
-        		apiVersion: "autoscaling/v2beta2"
-        	}
-        	if context.clusterVersion.minor >= 23 {
-        		apiVersion: "autoscaling/v2"
-        	}
-        	kind: "HorizontalPodAutoscaler"
-        	metadata: name: context.name
-        	spec: {
-        		scaleTargetRef: {
-        			apiVersion: parameter.targetAPIVersion
-        			kind:       parameter.targetKind
-        			name:       context.name
-        		}
-        		minReplicas: parameter.min
-        		maxReplicas: parameter.max
-        		metrics: [
-        			{
-        				type: "Resource"
-        				resource: {
-        					name: "cpu"
-        					target: {
-        						type: parameter.cpu.type
-        						if parameter.cpu.type == "Utilization" {
-        							averageUtilization: parameter.cpu.value
-        						}
-        						if parameter.cpu.type == "AverageValue" {
-        							averageValue: parameter.cpu.value
-        						}
-        					}
-        				}
-        			},
-        			if parameter.mem != _|_ {
-        				{
-        					type: "Resource"
-        					resource: {
-        						name: "memory"
-        						target: {
-        							type: parameter.mem.type
-        							if parameter.cpu.type == "Utilization" {
-        								averageUtilization: parameter.cpu.value
-        							}
-        							if parameter.cpu.type == "AverageValue" {
-        								averageValue: parameter.cpu.value
-        							}
-        						}
-        					}
-        				}
-        			},
-        			if parameter.podCustomMetrics != _|_ for m in parameter.podCustomMetrics {
-        				type: "Pods"
-        				pods: {
-        					metric: name: m.name
-        					target: {
-        						type:         "AverageValue"
-        						averageValue: m.value
-        					}
-        				}
-        			},
-        		]
-        	}
-        }
-        parameter: {
-        	// +usage=Specify the minimal number of replicas to which the autoscaler can scale down
-        	min: *1 | int
-        	// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up
-        	max: *10 | int
-        	// +usage=Specify the apiVersion of scale target
-        	targetAPIVersion: *"apps/v1" | string
-        	// +usage=Specify the kind of scale target
-        	targetKind: *"Deployment" | string
-        	cpu: {
-        		// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue")
-        		type: *"Utilization" | "AverageValue"
-        		// +usage=Specify the value of CPU utilization or averageValue
-        		value: *50 | int
-        	}
-        	mem?: {
-        		// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue")
-        		type: *"Utilization" | "AverageValue"
-        		// +usage=Specify  the value of MEM utilization or averageValue
-        		value: *50 | int
-        	}
-        	// +usage=Specify custom metrics of pod type
-        	podCustomMetrics?: [...{
-        		// +usage=Specify name of custom metrics
-        		name: string
-        		// +usage=Specify target value of custom metrics
-        		value: string
-        	}]
-        }
-

charts/vela-core/templates/defwithtemplate/k8s-update-strategy.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/k8s-update-strategy.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Set k8s update strategy for Deployment/DaemonSet/StatefulSet
-  name: k8s-update-strategy
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-  conflictsWith: []
-  podDisruptive: false
-  schematic:
-    cue:
-      template: |
-        patch: spec: {
-        	if parameter.targetKind == "Deployment" && parameter.strategy.type != "OnDelete" {
-        		// +patchStrategy=retainKeys
-        		strategy: {
-        			type: parameter.strategy.type
-        			if parameter.strategy.type == "RollingUpdate" {
-        				rollingUpdate: {
-        					maxSurge:       parameter.strategy.rollingStrategy.maxSurge
-        					maxUnavailable: parameter.strategy.rollingStrategy.maxUnavailable
-        				}
-        			}
-        		}
-        	}
-
-        	if parameter.targetKind == "StatefulSet" && parameter.strategy.type != "Recreate" {
-        		// +patchStrategy=retainKeys
-        		updateStrategy: {
-        			type: parameter.strategy.type
-        			if parameter.strategy.type == "RollingUpdate" {
-        				rollingUpdate: partition: parameter.strategy.rollingStrategy.partition
-        			}
-        		}
-        	}
-
-        	if parameter.targetKind == "DaemonSet" && parameter.strategy.type != "Recreate" {
-        		// +patchStrategy=retainKeys
-        		updateStrategy: {
-        			type: parameter.strategy.type
-        			if parameter.strategy.type == "RollingUpdate" {
-        				rollingUpdate: {
-        					maxSurge:       parameter.strategy.rollingStrategy.maxSurge
-        					maxUnavailable: parameter.strategy.rollingStrategy.maxUnavailable
-        				}
-        			}
-        		}
-        	}
-
-        }
-        parameter: {
-        	// +usage=Specify the apiVersion of target
-        	targetAPIVersion: *"apps/v1" | string
-        	// +usage=Specify the kind of target
-        	targetKind: *"Deployment" | "StatefulSet" | "DaemonSet"
-        	// +usage=Specify the strategy of update
-        	strategy: {
-        		// +usage=Specify the strategy type
-        		type: *"RollingUpdate" | "Recreate" | "OnDelete"
-        		// +usage=Specify the parameters of rollong update strategy
-        		rollingStrategy?: {
-        			maxSurge:       *"25%" | string
-        			maxUnavailable: *"25%" | string
-        			partition:      *0 | int
-        		}
-        	}
-        }
-  workloadRefPath: ""
-

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

@@ -56,41 +56,44 @@ spec:
         		// +usage=Specify the message that you want to sent, refer to [dingtalk messaging](https://developers.dingtalk.com/document/robots/custom-robot-access/title-72m-8ag-pqw)
         		message: {
         			// +usage=Specify the message content of dingtalk notification
-        			text?: close({
+        			text?: *null | close({
         				content: string
         			})
         			// +usage=msgType can be text, link, mardown, actionCard, feedCard
         			msgtype: *"text" | "link" | "markdown" | "actionCard" | "feedCard"
-        			#link: {
+        			link?:   *null | close({
         				text?:       string
         				title?:      string
         				messageUrl?: string
         				picUrl?:     string
-        			}
-
-        			link?:     #link
-        			markdown?: close({
+        			})
+        			markdown?: *null | close({
         				text:  string
         				title: string
         			})
-        			at?: close({
-        				atMobiles?: [...string]
-        				isAtAll?: bool
+        			at?: *null | close({
+        				atMobiles?: *null | [...string]
+        				isAtAll?:   bool
         			})
-        			actionCard?: close({
+        			actionCard?: *null | close({
         				text:           string
         				title:          string
         				hideAvatar:     string
         				btnOrientation: string
         				singleTitle:    string
         				singleURL:      string
-        				btns?: [...close({
+        				btns:           *null | close([...*null | close({
         					title:     string
         					actionURL: string
-        				})]
+        				})])
         			})
-        			feedCard?: close({
-        				links: [...#link]
+        			feedCard?: *null | close({
+        				links: *null | close([...*null | close({
+        					text?:       string
+        					title?:      string
+        					messageUrl?: string
+        					picUrl?:     string
+        				})])
         			})
         		}
         	}
@@ -111,11 +114,11 @@ spec:
         		// +usage=Specify the message that you want to sent, refer to [slack messaging](https://api.slack.com/reference/messaging/payload)
         		message: {
         			// +usage=Specify the message text for slack notification
-        			text: string
-        			blocks?: [...block]
-        			attachments?: close({
-        				blocks?: [...block]
-        				color?: string
+        			text:         string
+        			blocks?:      *null | close([...block])
+        			attachments?: *null | close({
+        				blocks?: *null | close([...block])
+        				color?:  string
         			})
         			thread_ts?: string
         			// +usage=Specify the message text format in markdown for slack notification

charts/vela-core/templates/defwithtemplate/print-message-in-status.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: print message in workflow step status
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: print-message-in-status
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: Read Kubernetes objects from cluster for your workflow steps
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: read-object
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -1,38 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/read-only.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the resources to be read-only in the application (no update / state-keep).
-  name: read-only
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #PolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector: #RuleSelector
-        }
-        #RuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=Specify the list of rules to control read only strategy at resource level.
-        	// The selected resource will be read-only to the current application. If the target resource does
-        	// not exist, error will be raised.
-        	rules?: [...#PolicyRule]
-        }
-

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

@@ -1,47 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/request.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/alias: ""
-    definition.oam.dev/description: Send request to the url
-    definition.oam.dev/example-url: https://raw.githubusercontent.com/kubevela/workflow/main/examples/workflow-run/request.yaml
-  name: request
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/json"
-        )
-
-        http: op.#HTTPDo & {
-        	method: parameter.method
-        	url:    parameter.url
-        	request: {
-        		if parameter.body != _|_ {
-        			body: json.Marshal(parameter.body)
-        		}
-        		if parameter.header != _|_ {
-        			header: parameter.header
-        		}
-        	}
-        }
-        fail: op.#Steps & {
-        	if http.response.statusCode > 400 {
-        		requestFail: op.#Fail & {
-        			message: "request of \(parameter.url) is fail: \(http.response.statusCode)"
-        		}
-        	}
-        }
-        response: json.Unmarshal(http.response.body)
-        parameter: {
-        	url:    string
-        	method: *"GET" | "POST" | "PUT" | "DELETE"
-        	body?: {...}
-        	header?: [string]: string
-        }
-

charts/vela-core/templates/defwithtemplate/startup-probe.yaml

@@ -1,168 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/startup-probe.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Add startup probe hooks for the specified container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  name: startup-probe
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
-  podDisruptive: true
-  schematic:
-    cue:
-      template: |
-        #StartupProbeParams: {
-        	// +usage=Specify the name of the target container, if not set, use the component name
-        	containerName: *"" | string
-        	// +usage=Number of seconds after the container has started before liveness probes are initiated. Minimum value is 0.
-        	initialDelaySeconds: *0 | int
-        	// +usage=How often, in seconds, to execute the probe. Minimum value is 1.
-        	periodSeconds: *10 | int
-        	// +usage=Number of seconds after which the probe times out. Minimum value is 1.
-        	timeoutSeconds: *1 | int
-        	// +usage=Minimum consecutive successes for the probe to be considered successful after having failed.  Minimum value is 1.
-        	successThreshold: *1 | int
-        	// +usage=Minimum consecutive failures for the probe to be considered failed after having succeeded. Minimum value is 1.
-        	failureThreshold: *3 | int
-        	// +usage=Optional duration in seconds the pod needs to terminate gracefully upon probe failure. Set this value longer than the expected cleanup time for your process.
-        	terminationGracePeriodSeconds?: int
-        	// +usage=Instructions for assessing container startup status by executing a command. Either this attribute or the httpGet attribute or the grpc attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with the httpGet attribute and the tcpSocket attribute and the gRPC attribute.
-        	exec?: {
-        		// +usage=A command to be executed inside the container to assess its health. Each space delimited token of the command is a separate array element. Commands exiting 0 are considered to be successful probes, whilst all other exit codes are considered failures.
-        		command: [...string]
-        	}
-        	// +usage=Instructions for assessing container startup status by executing an HTTP GET request. Either this attribute or the exec attribute or the grpc attribute or the tcpSocket attribute MUST be specified. This attribute is mutually exclusive with the exec attribute and the tcpSocket attribute and the gRPC attribute.
-        	httpGet?: {
-        		// +usage=The endpoint, relative to the port, to which the HTTP GET request should be directed.
-        		path?: string
-        		// +usage=The port numer to access on the host or container.
-        		port: int
-        		// +usage=The hostname to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
-        		host?: string
-        		// +usage=The Scheme to use for connecting to the host.
-        		scheme?: *"HTTP" | "HTTPS"
-        		// +usage=Custom headers to set in the request. HTTP allows repeated headers.
-        		httpHeaders?: [...{
-        			// +usage=The header field name
-        			name: string
-        			//+usage=The header field value
-        			value: string
-        		}]
-        	}
-        	// +usage=Instructions for assessing container startup status by probing a gRPC service. Either this attribute or the exec attribute or the grpc attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with the exec attribute and the httpGet attribute and the tcpSocket attribute.
-        	grpc?: {
-        		// +usage=The port number of the gRPC service.
-        		port: int
-        		// +usage=The name of the service to place in the gRPC HealthCheckRequest
-        		service?: string
-        	}
-        	// +usage=Instructions for assessing container startup status by probing a TCP socket. Either this attribute or the exec attribute or the tcpSocket attribute or the httpGet attribute MUST be specified. This attribute is mutually exclusive with the exec attribute and the httpGet attribute and the gRPC attribute.
-        	tcpSocket?: {
-        		// +usage=Number or name of the port to access on the container.
-        		port: string
-        		// +usage=Host name to connect to, defaults to the pod IP.
-        		host?: string
-        	}
-        }
-        PatchContainer: {
-        	_params:         #StartupProbeParams
-        	name:            _params.containerName
-        	_baseContainers: context.output.spec.template.spec.containers
-        	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
-        	if len(_matchContainers_) == 0 {
-        		err: "container \(name) not found"
-        	}
-        	if len(_matchContainers_) > 0 {
-        		startupProbe: {
-        			if _params.exec != _|_ {
-        				exec: _params.exec
-        			}
-        			if _params.httpGet != _|_ {
-        				httpGet: _params.httpGet
-        			}
-        			if _params.grpc != _|_ {
-        				grpc: _params.grpc
-        			}
-        			if _params.tcpSocket != _|_ {
-        				tcpSocket: _params.tcpSocket
-        			}
-        			if _params.initialDelaySeconds != _|_ {
-        				initialDelaySeconds: _params.initialDelaySeconds
-        			}
-        			if _params.periodSeconds != _|_ {
-        				periodSeconds: _params.periodSeconds
-        			}
-        			if _params.tcpSocket != _|_ {
-        				tcpSocket: _params.tcpSocket
-        			}
-        			if _params.timeoutSeconds != _|_ {
-        				timeoutSeconds: _params.timeoutSeconds
-        			}
-        			if _params.successThreshold != _|_ {
-        				successThreshold: _params.successThreshold
-        			}
-        			if _params.failureThreshold != _|_ {
-        				failureThreshold: _params.failureThreshold
-        			}
-        			if _params.terminationGracePeriodSeconds != _|_ {
-        				terminationGracePeriodSeconds: _params.terminationGracePeriodSeconds
-        			}
-        		}
-        	}
-        }
-        patch: spec: template: spec: {
-        	if parameter.probes == _|_ {
-        		// +patchKey=name
-        		containers: [{
-        			PatchContainer & {_params: {
-        				if parameter.containerName == "" {
-        					containerName: context.name
-        				}
-        				if parameter.containerName != "" {
-        					containerName: parameter.containerName
-        				}
-        				periodSeconds:                 parameter.periodSeconds
-        				initialDelaySeconds:           parameter.initialDelaySeconds
-        				timeoutSeconds:                parameter.timeoutSeconds
-        				successThreshold:              parameter.successThreshold
-        				failureThreshold:              parameter.failureThreshold
-        				terminationGracePeriodSeconds: parameter.terminationGracePeriodSeconds
-        				if parameter.exec != _|_ {
-        					exec: parameter.exec
-        				}
-        				if parameter.httpGet != _|_ {
-        					httpGet: parameter.httpGet
-        				}
-        				if parameter.grpc != _|_ {
-        					grpc: parameter.grpc
-        				}
-        				if parameter.tcpSocket != _|_ {
-        					tcpSocket: parameter.grtcpSocketpc
-        				}
-        			}}
-        		}]
-        	}
-        	if parameter.probes != _|_ {
-        		// +patchKey=name
-        		containers: [ for c in parameter.probes {
-        			if c.name == "" {
-        				err: "containerName must be set when specifying startup probe for multiple containers"
-        			}
-        			if c.name != "" {
-        				PatchContainer & {_params: c}
-        			}
-        		}]
-        	}
-        }
-        parameter: *#StartupProbeParams | close({
-        	// +usage=Specify the startup probe for multiple containers
-        	probes: [...#StartupProbeParams]
-        })
-        errs: [ for c in patch.spec.template.spec.containers if c.err != _|_ {c.err}]
-

charts/vela-core/templates/defwithtemplate/step-group.yaml

@@ -5,6 +5,8 @@ kind: WorkflowStepDefinition
 metadata:
   annotations:
     definition.oam.dev/description: A special step that you can declare 'subSteps' in it, 'subSteps' is an array containing any step type whose valid parameters do not include the `step-group` step type itself. The sub steps were executed in parallel.
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
   name: step-group
   namespace: {{ include "systemDefinitionNamespace" . }}
 spec:

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

@@ -54,12 +54,6 @@ spec:
         			emptyDir: medium: v.medium
         		}
         	},
-        	if parameter.hostPath != _|_ for v in parameter.hostPath {
-        		{
-        			name: "hostpath-" + v.name
-        			path: v.path
-        		}
-        	},
         ]
         volumeMountsList: [
         	if parameter.pvc != _|_ for v in parameter.pvc {
@@ -100,12 +94,6 @@ spec:
         			}
         		}
         	},
-        	if parameter.hostPath != _|_ for v in parameter.hostPath {
-        		{
-        			name:      "hostpath-" + v.name
-        			mountPath: v.mountPath
-        		}
-        	},
         ]
         envList: [
         	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
@@ -323,7 +311,7 @@ spec:
         			envName:   string
         			secretKey: string
         		}]
-        		mountPath:   string
+        		mountPath?:  string
         		subPath?:    string
         		defaultMode: *420 | int
         		readOnly:    *false | bool
@@ -343,13 +331,5 @@ spec:
         		subPath?:  string
         		medium:    *"" | "Memory"
         	}]
-
-        	// +usage=Declare host path type storage
-        	hostPath?: [...{
-        		name:      string
-        		path:      string
-        		mountPath: string
-        		type:      *"Directory" | "DirectoryOrCreate" | "FileOrCreate" | "File" | "Socket" | "CharDevice" | "BlockDevice"
-        	}]
         }
 

charts/vela-core/templates/defwithtemplate/take-over.yaml

@@ -1,38 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/take-over.cue
-apiVersion: core.oam.dev/v1beta1
-kind: PolicyDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Configure the resources to be able to take over when it belongs to no application.
-  name: take-over
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        #PolicyRule: {
-        	// +usage=Specify how to select the targets of the rule
-        	selector: [...#RuleSelector]
-        }
-        #RuleSelector: {
-        	// +usage=Select resources by component names
-        	componentNames?: [...string]
-        	// +usage=Select resources by component types
-        	componentTypes?: [...string]
-        	// +usage=Select resources by oamTypes (COMPONENT or TRAIT)
-        	oamTypes?: [...string]
-        	// +usage=Select resources by trait types
-        	traitTypes?: [...string]
-        	// +usage=Select resources by resource types (like Deployment)
-        	resourceTypes?: [...string]
-        	// +usage=Select resources by their names
-        	resourceNames?: [...string]
-        }
-        parameter: {
-        	// +usage=Specify the list of rules to control take over strategy at resource level.
-        	// The selected resource will be able to be taken over by the current application when the resource belongs to no
-        	// one.
-        	rules?: [...#PolicyRule]
-        }
-

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

@@ -1,67 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/topologyspreadconstraints.cue
-apiVersion: core.oam.dev/v1beta1
-kind: TraitDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Add topology spread constraints hooks for every container of K8s pod for your workload which follows the pod spec in path 'spec.template'.
-  name: topologyspreadconstraints
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  appliesToWorkloads:
-    - deployments.apps
-    - statefulsets.apps
-    - daemonsets.apps
-    - jobs.batch
-  podDisruptive: true
-  schematic:
-    cue:
-      template: |
-        constraintsArray: [
-        	for v in parameter.constraints {
-        		maxSkew:           v.maxSkew
-        		topologyKey:       v.topologyKey
-        		whenUnsatisfiable: v.whenUnsatisfiable
-        		labelSelector:     v.labelSelector
-        		if v.nodeAffinityPolicy != _|_ {
-        			nodeAffinityPolicy: v.nodeAffinityPolicy
-        		}
-        		if v.nodeTaintsPolicy != _|_ {
-        			nodeTaintsPolicy: v.nodeTaintsPolicy
-        		}
-        		if v.minDomains != _|_ {
-        			minDomains: v.minDomains
-        		}
-        		if v.matchLabelKeys != _|_ {
-        			matchLabelKeys: v.matchLabelKeys
-        		}
-        	},
-        ]
-        patch: spec: template: spec: topologySpreadConstraints: constraintsArray
-        #labSelector: {
-        	matchLabels?: [string]: string
-        	matchExpressions?: [...{
-        		key:      string
-        		operator: *"In" | "NotIn" | "Exists" | "DoesNotExist"
-        		values?: [...string]
-        	}]
-        }
-        parameter: constraints: [...{
-        	// +usage=Describe the degree to which Pods may be unevenly distributed
-        	maxSkew: int
-        	// +usage=Specify the key of node labels
-        	topologyKey: string
-        	// +usage=Indicate how to deal with a Pod if it doesn't satisfy the spread constraint
-        	whenUnsatisfiable: *"DoNotSchedule" | "ScheduleAnyway"
-        	// +usage: labelSelector to find matching Pods
-        	labelSelector: #labSelector
-        	// +usage=Indicate a minimum number of eligible domains
-        	minDomains?: int
-        	// +usage=A list of pod label keys to select the pods over which spreading will be calculated
-        	matchLabelKeys?: [...string]
-        	// +usage=Indicate how we will treat Pod's nodeAffinity/nodeSelector when calculating pod topology spread skew
-        	nodeAffinityPolicy?: *"Honor" | "Ignore"
-        	// +usage=Indicate how we will treat node taints when calculating pod topology spread skew
-        	nodeTaintsPolicy?: *"Honor" | "Ignore"
-        }]
-

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

@@ -1,149 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/vela-cli.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Run a vela command
-    definition.oam.dev/example-url: https://raw.githubusercontent.com/kubevela/workflow/main/examples/workflow-run/apply-terraform-resource.yaml
-  name: vela-cli
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        )
-
-        mountsArray: [
-        	if parameter.storage != _|_ && parameter.storage.secret != _|_ for v in parameter.storage.secret {
-        		{
-        			name:      "secret-" + v.name
-        			mountPath: v.mountPath
-        			if v.subPath != _|_ {
-        				subPath: v.subPath
-        			}
-        		}
-        	},
-        	if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
-        		{
-        			name:      "hostpath-" + v.name
-        			mountPath: v.mountPath
-        		}
-        	},
-        ]
-        volumesList: [
-        	if parameter.storage != _|_ && parameter.storage.secret != _|_ for v in parameter.storage.secret {
-        		{
-        			name: "secret-" + v.name
-        			secret: {
-        				defaultMode: v.defaultMode
-        				secretName:  v.secretName
-        				if v.items != _|_ {
-        					items: v.items
-        				}
-        			}
-        		}
-        		if parameter.storage != _|_ && parameter.storage.hostPath != _|_ for v in parameter.storage.hostPath {
-        			{
-        				name: "hostpath-" + v.name
-        				path: v.path
-        			}
-        		}
-        	},
-        ]
-        deDupVolumesArray: [
-        	for val in [
-        		for i, vi in volumesList {
-        			for j, vj in volumesList if j < i && vi.name == vj.name {
-        				_ignore: true
-        			}
-        			vi
-        		},
-        	] if val._ignore == _|_ {
-        		val
-        	},
-        ]
-        job: op.#Apply & {
-        	value: {
-        		apiVersion: "batch/v1"
-        		kind:       "Job"
-        		metadata: {
-        			name: "\(context.name)-\(context.stepName)-\(context.stepSessionID)"
-        			if parameter.serviceAccountName == "kubevela-vela-core" {
-        				namespace: "vela-system"
-        			}
-        			if parameter.serviceAccountName != "kubevela-vela-core" {
-        				namespace: context.namespace
-        			}
-        		}
-        		spec: {
-        			backoffLimit: 3
-        			template: {
-        				metadata: labels: "workflow.oam.dev/step-name": "\(context.name)-\(context.stepName)"
-        				spec: {
-        					containers: [
-        						{
-        							name:         "\(context.name)-\(context.stepName)-\(context.stepSessionID)-job"
-        							image:        parameter.image
-        							command:      parameter.command
-        							volumeMounts: mountsArray
-        						},
-        					]
-        					restartPolicy:  "Never"
-        					serviceAccount: parameter.serviceAccountName
-        					volumes:        deDupVolumesArray
-        				}
-        			}
-        		}
-        	}
-        }
-        log: op.#Log & {
-        	source: resources: [{labelSelector: "workflow.oam.dev/step-name": "\(context.name)-\(context.stepName)"}]
-        }
-        fail: op.#Steps & {
-        	if job.value.status.failed != _|_ {
-        		if job.value.status.failed > 2 {
-        			breakWorkflow: op.#Fail & {
-        				message: "failed to execute vela command"
-        			}
-        		}
-        	}
-        }
-        wait: op.#ConditionalWait & {
-        	continue: job.value.status.succeeded != _|_ && job.value.status.succeeded > 0
-        }
-        parameter: {
-        	// +usage=Specify the name of the addon.
-        	addonName: string
-        	// +usage=Specify the vela command
-        	command: [...string]
-        	// +usage=Specify the image
-        	image: *"oamdev/vela-cli:v1.6.4" | string
-        	// +usage=specify serviceAccountName want to use
-        	serviceAccountName: *"kubevela-vela-core" | string
-        	storage?: {
-        		// +usage=Mount Secret type storage
-        		secret?: [...{
-        			name:        string
-        			mountPath:   string
-        			subPath?:    string
-        			defaultMode: *420 | int
-        			secretName:  string
-        			items?: [...{
-        				key:  string
-        				path: string
-        				mode: *511 | int
-        			}]
-        		}]
-        		// +usage=Declare host path type storage
-        		hostPath?: [...{
-        			name:      string
-        			path:      string
-        			mountPath: string
-        			type:      *"Directory" | "DirectoryOrCreate" | "FileOrCreate" | "File" | "Socket" | "CharDevice" | "BlockDevice"
-        		}]
-        	}
-        }
-

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

@@ -185,10 +185,6 @@ spec:
         						command: parameter.cmd
         					}
 
-        					if parameter["args"] != _|_ {
-        						args: parameter.args
-        					}
-
         					if parameter["env"] != _|_ {
         						env: parameter.env
         					}
@@ -367,9 +363,6 @@ spec:
         	// +usage=Commands to run in the container
         	cmd?: [...string]
 
-        	// +usage=Arguments to the entrypoint
-        	args?: [...string]
-
         	// +usage=Define arguments by using environment variables
         	env?: [...{
         		// +usage=Environment variable name

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

@@ -11,6 +11,21 @@ metadata:
   {{- end }}
 {{- end }}
 
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kubevela.fullname" . }}:manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ if .Values.authentication.enabled }} {{ include "kubevela.fullname" . }}:manager {{ else }} "cluster-admin" {{ end }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "kubevela.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+
 {{ if .Values.authentication.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -51,40 +66,8 @@ rules:
   - apiGroups: ["authorization.k8s.io"]
     resources: ["subjectaccessreviews"]
     verbs: ["*"]
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "kubevela.fullname" . }}:manager-authentication-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "kubevela.fullname" . }}:manager
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "kubevela.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-
-{{ else }}
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "kubevela.fullname" . }}:manager-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: "cluster-admin"
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "kubevela.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-
 {{ end }}
+
 ---
 # permissions to do leader election.
 apiVersion: rbac.authorization.k8s.io/v1
@@ -272,9 +255,6 @@ spec:
             - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
             - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
             - "--feature-gates=MultiStageComponentApply= {{- .Values.featureGates.multiStageComponentApply | toString -}}"
-            - "--feature-gates=GzipApplicationRevision={{- .Values.featureGates.gzipApplicationRevision | toString -}}"
-            - "--feature-gates=ZstdApplicationRevision={{- .Values.featureGates.zstdApplicationRevision | toString -}}"
-            - "--feature-gates=PreDispatchDryRun={{- .Values.featureGates.preDispatchDryRun | toString -}}"
             {{ if .Values.authentication.enabled }}
             {{ if .Values.authentication.withUser }}
             - "--authentication-with-user"

charts/vela-core/templates/velaql/component-pod.yaml

@@ -1,8 +1,9 @@
+{{- if not (lookup "v1" "ConfigMap" (include "systemDefinitionNamespace" .) "component-pod-view") }}
 apiVersion: v1
 data:
   template: |
       import (
-        "vela/ql"
+      "vela/ql"
       )
 
       parameter: {
@@ -55,15 +56,9 @@ data:
               phase: pod.object.status.phase
               // refer to https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
               if phase != "Pending" && phase != "Unknown" {
-                if pod.object.podIP != _|_ {
-                  podIP: pod.object.status.podIP
-                }
-                if pod.object.hostIP != _|_ {
-                  hostIP: pod.object.status.hostIP
-                }
-                if pod.object.nodeName != _|_ {
-                  nodeName: pod.object.spec.nodeName
-                }
+                podIP:    pod.object.status.podIP
+                hostIP:   pod.object.status.hostIP
+                nodeName: pod.object.spec.nodeName
               }
             }
           }]
@@ -79,3 +74,4 @@ kind: ConfigMap
 metadata:
   name: component-pod-view
   namespace: {{ include "systemDefinitionNamespace" . }}
+{{- end }}

charts/vela-core/templates/velaql/component-service.yaml

@@ -1,3 +1,4 @@
+{{- if not (lookup "v1" "ConfigMap" (include "systemDefinitionNamespace" .) "component-service-view") }}
 apiVersion: v1
 data:
   template: |
@@ -46,3 +47,4 @@ kind: ConfigMap
 metadata:
   name: component-service-view
   namespace: {{ include "systemDefinitionNamespace" . }}
+{{- end}}

charts/vela-core/values.yaml

@@ -8,10 +8,10 @@
 systemDefinitionNamespace:
 
 ## @param applicationRevisionLimit Application revision limit
-applicationRevisionLimit: 2
+applicationRevisionLimit: 10
 
 ## @param definitionRevisionLimit Definition revision limit
-definitionRevisionLimit: 2
+definitionRevisionLimit: 20
 
 ## @param concurrentReconciles concurrentReconciles is the concurrent reconcile number of the controller
 concurrentReconciles: 4
@@ -26,6 +26,9 @@ OAMSpecVer: "v0.3"
 ## @param disableCaps Disable capability
 disableCaps: "rollout"
 
+## @param enableFluxcdAddon Whether to enable fluxcd addon
+enableFluxcdAddon: false
+
 ## @param dependCheckWait dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready
 dependCheckWait: 30s
 
@@ -99,7 +102,7 @@ optimize:
   resourceTrackerListOp: true
   controllerReconcileLoopReduction: false
   markWithProb: 0.1
-  disableComponentRevision: true
+  disableComponentRevision: false
   disableApplicationRevision: false
   disableWorkflowRecorder: false
   enableInMemoryWorkflowContext: false
@@ -107,23 +110,16 @@ optimize:
   enableResourceTrackerDeleteOnlyTrigger: true
 
 ##@param featureGates.enableLegacyComponentRevision if disabled, only component with rollout trait will create component revisions
-##@param featureGates.gzipResourceTracker compress ResourceTracker using gzip (good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers.
-##@param featureGates.zstdResourceTracker compress ResourceTracker using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge ResourceTrackers. Note that zstd will be prioritized if you enable other compression options.
+##@param featureGates.gzipResourceTracker if enabled, resourceTracker will be compressed using gzip before being stored
+##@param featureGates.zstdResourceTracker if enabled, resourceTracker will be compressed using zstd before being stored. It is much faster and more efficient than gzip. If both gzip and zstd are enabled, zstd will be used.
 ##@param featureGates.applyOnce if enabled, the apply-once feature will be applied to all applications, no state-keep and no resource data storage in ResourceTracker
 ##@param featureGates.multiStageComponentApply if enabled, the multiStageComponentApply feature will be combined with the stage field in TraitDefinition to complete the multi-stage apply.
-##@param featureGates.gzipApplicationRevision compress apprev using gzip (good) before being stored. This is reduces network throughput when dealing with huge apprevs.
-##@param featureGates.zstdApplicationRevision compress apprev using zstd (fast and good) before being stored. This is reduces network throughput when dealing with huge apprevs. Note that zstd will be prioritized if you enable other compression options.
-##@param featureGates.preDispatchDryRun enable dryrun before dispatching resources. Enable this flag can help prevent unsuccessful dispatch resources entering resourcetracker and improve the user experiences of gc but at the cost of increasing network requests.
-##@param
 featureGates:
   enableLegacyComponentRevision: false
   gzipResourceTracker: false
-  zstdResourceTracker: true
+  zstdResourceTracker: false
   applyOnce: false
   multiStageComponentApply: false
-  gzipApplicationRevision: false
-  zstdApplicationRevision: true
-  preDispatchDryRun: true
 
 ## @section MultiCluster parameters
 
@@ -148,7 +144,7 @@ multicluster:
     port: 9443
     image:
       repository: oamdev/cluster-gateway
-      tag: v1.7.0
+      tag: v1.4.0
       pullPolicy: IfNotPresent
     resources:
       limits:
@@ -253,11 +249,11 @@ admissionWebhooks:
     enabled: false
     revisionHistoryLimit: 3
 
-## @param kubeClient.qps The qps for reconcile clients, default is 100
-## @param kubeClient.burst The burst for reconcile clients, default is 200
+## @param kubeClient.qps The qps for reconcile clients, default is 50
+## @param kubeClient.burst The burst for reconcile clients, default is 100
 kubeClient:
-  qps: 100
-  burst: 200
+  qps: 50
+  burst: 100
 
 ## @param authentication.enabled Enable authentication for application
 ## @param authentication.withUser Application authentication will impersonate as the request User
@@ -265,6 +261,6 @@ kubeClient:
 ## @param authentication.groupPattern Application authentication will impersonate as the request Group that matches the pattern
 authentication:
   enabled: false
-  withUser: true
+  withUser: false
   defaultUser: kubevela:vela-core
   groupPattern: kubevela:*

charts/vela-minimal/README.md

@@ -66,6 +66,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `minimal`            |
 | `disableCaps`                 | Disable capability                                                                            | `envbinding,rollout` |
 | `applyOnceOnly`               | Valid applyOnceOnly values: true/false/on/off/force                                           | `off`                |
+| `enableFluxcdAddon`           | Whether to enable fluxcd addon                                                                | `false`              |
 | `dependCheckWait`             | dependCheckWait is the time to wait for ApplicationConfiguration's dependent-resource ready   | `30s`                |
 
 
@@ -105,7 +106,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 | `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.7.0`                         |
+| `multicluster.clusterGateway.image.tag`               | ClusterGateway image tag         | `v1.4.0`                         |
 | `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`                          |