[Backport release-1.6] Feat: implement pipeline APIs (#4969)

* add context when run pipeline

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 72f3ad792e)

* Feat: implement pipeline API

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit f560c346cc)

* Extract get log logic and implement getPipelineRunLog API

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 060c6ab9e9)

* Init and delete pipeline contexts

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 5e96bd3106)

* fix panic

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 51072f7947)

* Allow not specifying context

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 810ddcf0bd)

* change pipeline to path parameter

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 3d51c0cb2d)

* Add permission check filter

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 6883767430)

* project -> projects in route

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 1f09f3996b)

* fix route conflict

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 7eea696830)

* Add project alias

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit b07dd72338)

* Feat: change the list pipeline API

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit bd804734b0)

* Feat: filter the project

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit 82eee2cc11)

* Fix: the error of the run APi

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit ac87bd3f1a)

* fix log pipeline run API

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit acde8e981e)

* Fix lint, fix the error of log api

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit b8373e6cde)

* fix error returning

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 2e9b4792b0)

* Fix: change the lable to annotation

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit bf08275fde)

* remove log config not found error

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit cdd77dfd8f)

* fix pipeline list api return no context info

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit cdcfa165d1)

* Fix: create the namespace

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit b6888dd87d)

* get pipeline lastrun info

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit a943423d22)

* allow query single step output

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit e2310bbf34)

* organize code in api layer

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 6fd53ed078)

* fix project filter, add context value when get pp run, extend lastRun

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 861f69d555)

* fix get output and implement get input api

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 61495ee70d)

* Fix: change the last run

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit aeb842a45e)

* if query sub-step outout, return it directly

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 467ba25751)

* Fix: change the run stats

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit 7a90e7e310)

* Fix: change the output

Signed-off-by: barnettZQG <barnett.zqg@gmail.com>
(cherry picked from commit 595a871b0d)

* flatten the input/output api

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit efc9692354)

* more info for i/o vars

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 7fe0e1109c)

* fix nested i/o struct

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 201d1228bd)

* add fromStep in input api

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 2400018962)

* add e2e test skeleton

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit f20f9a1ac6)

* add more e2e test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 98b27f886b)

* use db to store pipeline

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 08962c4f2f)

* keep the last 5k lines of log

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 22b352da14)

* use stern param to keep last lines of logs

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 3eadbf91c8)

* filter, nil labels, spec check

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit bad90b3f7a)

* empty res, index, detail param

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit b12d889e97)

* Add e2e test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit ae617a928e)

* fix e2e test and unit test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 0f4e030b84)

* add context e2e test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 88879e6e43)

* goimports

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 58429978b3)

* add more test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 75760521a4)

* review

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit cc4c706466)

* remove optional tag in returned value, unify the imports name

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 658b184aef)

* fix e2e test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit a9e9c96856)

* add stop test

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 58aa2e5125)

* more coverage

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 01ecb51323)

* single case selct

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit d9e8fd0342)

* optimize log color

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit be9840c3cb)

* add default permission and role

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit cf074444ac)

* fix permission ut

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 1bdcad63a2)

* change the log api implementation

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 587f745430)

* add color, add container order

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 6e7f187605)

* lint

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 64ba029031)

* fix filter nil will cut all log

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 799dfe377a)

* longer timeout and lint

Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
(cherry picked from commit 89873f1f66)

Co-authored-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
Co-authored-by: barnettZQG <barnett.zqg@gmail.com>

.github/workflows/apiserver-test.yaml

@@ -17,10 +17,10 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -138,7 +138,7 @@ jobs:
       - name: Calculate K3d args
         run: |
           EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
+          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
             EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
           fi
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 
@@ -176,10 +176,12 @@ jobs:
           make e2e-cleanup
           make e2e-setup-core
           bin/vela addon enable fluxcd
+          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
           kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
+          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-workflow -n vela-system --timeout=600s
 
       - name: Run api server e2e test
         run: |

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

@@ -15,10 +15,10 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -84,7 +84,7 @@ jobs:
       - name: Calculate K3d args
         run: |
           EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
+          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
             EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
           fi
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 

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

@@ -15,10 +15,10 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -83,7 +83,7 @@ jobs:
       - name: Calculate K3d args
         run: |
           EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
+          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
             EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
           fi
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 

.github/workflows/e2e-test.yml

@@ -15,10 +15,10 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
-  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.23\"]'
-  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.23\"]'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
+  K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]'
+  K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]'
 
 jobs:
 
@@ -83,7 +83,7 @@ jobs:
       - name: Calculate K3d args
         run: |
           EGRESS_ARG=""
-          if [[ "${{ matrix.k8s-version }}" == v1.23 ]]; then
+          if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then
             EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0"
           fi
           echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV 

.github/workflows/go.yml

@@ -13,8 +13,8 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
 
 jobs:
 
@@ -56,7 +56,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pkg-
 
       - name: Install StaticCheck
-        run: GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@v0.3.0
+        run: go install honnef.co/go/tools/cmd/staticcheck@2022.1
 
       - name: Static Check
         run: staticcheck ./...
@@ -117,6 +117,9 @@ jobs:
         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@v2
         with:
@@ -131,7 +134,10 @@ jobs:
         run: make cross-build
 
       - name: Check Diff
-        run: make 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
               
       - name: Cleanup binary
         run: make build-cleanup

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Get release
         id: get_release
         uses: bruceadams/get-release@v1.2.2
@@ -150,11 +150,15 @@ jobs:
       - 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

.github/workflows/sync-api.yml

@@ -14,8 +14,8 @@ jobs:
       - name: Set up Go 1.17
         uses: actions/setup-go@v1
         env:
-          GO_VERSION: '1.17'
-          GOLANGCI_VERSION: 'v1.38'
+          GO_VERSION: '1.19'
+          GOLANGCI_VERSION: 'v1.49'
         with:
           go-version: ${{ env.GO_VERSION }}
         id: go

.github/workflows/unit-test.yml

@@ -13,8 +13,8 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
-  GOLANGCI_VERSION: 'v1.38'
+  GO_VERSION: '1.19'
+  GOLANGCI_VERSION: 'v1.49'
 
 jobs:
 

.golangci.yml

@@ -38,7 +38,7 @@ linters-settings:
     # report about shadowed variables
     check-shadowing: false
 
-  golint:
+  revive:
     # minimal confidence for issues, default is 0.8
     min-confidence: 0.8
 
@@ -116,11 +116,20 @@ linters:
     - goconst
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.
-    - golint
+    - revive
     - unconvert
     - misspell
     - nakedret
-
+    - exportloopref
+  disable:
+    - deadcode
+    - scopelint
+    - structcheck
+    - varcheck
+    - rowserrcheck
+    - sqlclosecheck
+    - errchkjson
+    - contextcheck
   presets:
     - bugs
     - unused
@@ -137,7 +146,7 @@ issues:
         - errcheck
         - dupl
         - gosec
-        - scopelint
+        - exportloopref
         - unparam
 
     # Ease some gocritic warnings on test files.
@@ -186,7 +195,15 @@ issues:
 
     - text: "don't use an underscore"
       linters:
-        - golint
+        - revive
+
+    - text: "package-comments: should have a package comment"
+      linters:
+        - revive
+
+    - text: "error-strings: error strings should not be capitalized or end with punctuation or a newline"
+      linters:
+        - revive
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Dockerfile.apiserver

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace

Dockerfile.cli

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the cli binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-https://goproxy.cn}
 WORKDIR /workspace

Dockerfile.e2e

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17-alpine as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

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

@@ -203,6 +203,8 @@ const (
 	ApplicationWorkflowSuspending ApplicationPhase = "workflowSuspending"
 	// ApplicationWorkflowTerminated means the app's workflow is terminated
 	ApplicationWorkflowTerminated ApplicationPhase = "workflowTerminated"
+	// ApplicationWorkflowFailed means the app's workflow is failed
+	ApplicationWorkflowFailed ApplicationPhase = "workflowFailed"
 	// ApplicationWorkflowFinished means the app's workflow is finished
 	ApplicationWorkflowFinished ApplicationPhase = "workflowFinished"
 	// ApplicationRunning means the app finished rendering and applied result to the cluster
@@ -247,6 +249,12 @@ type ApplicationComponentStatus struct {
 	Scopes             []corev1.ObjectReference `json:"scopes,omitempty"`
 }
 
+// Equal check if two ApplicationComponentStatus are equal
+func (in ApplicationComponentStatus) Equal(r ApplicationComponentStatus) bool {
+	return in.Name == r.Name && in.Namespace == r.Namespace &&
+		in.Cluster == r.Cluster && in.Env == r.Env
+}
+
 // ApplicationTraitStatus records the trait health status
 type ApplicationTraitStatus struct {
 	Type    string `json:"type"`

apis/core.oam.dev/condition/condition.go

@@ -31,7 +31,7 @@ import (
 )
 
 // A ConditionType represents a condition a resource could be in.
-// nolint:golint
+// nolint
 type ConditionType string
 
 // Condition types.
@@ -45,7 +45,7 @@ const (
 )
 
 // A ConditionReason represents the reason a resource is in a condition.
-// nolint:golint
+// nolint
 type ConditionReason string
 
 // Reasons a resource is or is not ready.

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

@@ -23,8 +23,17 @@ import (
 const (
 	// ApplyOncePolicyType refers to the type of configuration drift policy
 	ApplyOncePolicyType = "apply-once"
+	// ApplyOnceStrategyOnAppUpdate policy takes effect on application updating
+	ApplyOnceStrategyOnAppUpdate ApplyOnceAffectStrategy = "onUpdate"
+	// ApplyOnceStrategyOnAppStateKeep policy takes effect on application state keep
+	ApplyOnceStrategyOnAppStateKeep ApplyOnceAffectStrategy = "onStateKeep"
+	// ApplyOnceStrategyAlways policy takes effect always
+	ApplyOnceStrategyAlways ApplyOnceAffectStrategy = "always"
 )
 
+// ApplyOnceAffectStrategy is a string that mark the policy effective stage
+type ApplyOnceAffectStrategy string
+
 // ApplyOncePolicySpec defines the spec of preventing configuration drift
 type ApplyOncePolicySpec struct {
 	Enable bool `json:"enable"`
@@ -45,6 +54,9 @@ type ApplyOnceStrategy struct {
 	// Path the specified path that allow configuration drift
 	// like 'spec.template.spec.containers[0].resources' and '*' means the whole target allow configuration drift
 	Path []string `json:"path"`
+	// ApplyOnceAffectStrategy Decide when the strategy will take effect
+	// like affect:onUpdate/onStateKeep/always
+	ApplyOnceAffectStrategy ApplyOnceAffectStrategy `json:"affect"`
 }
 
 // FindStrategy find apply-once strategy for target resource

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

@@ -49,6 +49,10 @@ type Placement struct {
 	// Exclusive to "clusters"
 	ClusterLabelSelector map[string]string `json:"clusterLabelSelector,omitempty"`
 
+	// AllowEmpty ignore empty cluster error when no cluster returned for label
+	// selector
+	AllowEmpty bool `json:"allowEmpty,omitempty"`
+
 	// DeprecatedClusterSelector is a depreciated alias for ClusterLabelSelector.
 	// Deprecated: Use clusterLabelSelector instead.
 	DeprecatedClusterSelector map[string]string `json:"clusterSelector,omitempty"`

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

@@ -1,65 +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 v1alpha2
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
-
-	"github.com/oam-dev/kubevela/pkg/oam"
-)
-
-var _ oam.Trait = &ManualScalerTrait{}
-
-// A ManualScalerTraitSpec defines the desired state of a ManualScalerTrait.
-type ManualScalerTraitSpec struct {
-	// ReplicaCount of the workload this trait applies to.
-	ReplicaCount int32 `json:"replicaCount"`
-
-	// WorkloadReference to the workload this trait applies to.
-	WorkloadReference corev1.ObjectReference `json:"workloadRef"`
-}
-
-// A ManualScalerTraitStatus represents the observed state of a
-// ManualScalerTrait.
-type ManualScalerTraitStatus struct {
-	condition.ConditionedStatus `json:",inline"`
-}
-
-// +kubebuilder:object:root=true
-
-// A ManualScalerTrait determines how many replicas a workload should have.
-// +kubebuilder:resource:categories={oam}
-// +kubebuilder:subresource:status
-type ManualScalerTrait struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   ManualScalerTraitSpec   `json:"spec,omitempty"`
-	Status ManualScalerTraitStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// ManualScalerTraitList contains a list of ManualScalerTrait.
-type ManualScalerTraitList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []ManualScalerTrait `json:"items"`
-}

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

@@ -24,26 +24,6 @@ import (
 	"github.com/oam-dev/kubevela/apis/core.oam.dev/condition"
 )
 
-// GetCondition of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetCondition(ct condition.ConditionType) condition.Condition {
-	return tr.Status.GetCondition(ct)
-}
-
-// SetConditions of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetConditions(c ...condition.Condition) {
-	tr.Status.SetConditions(c...)
-}
-
-// GetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) GetWorkloadReference() corev1.ObjectReference {
-	return tr.Spec.WorkloadReference
-}
-
-// SetWorkloadReference of this ManualScalerTrait.
-func (tr *ManualScalerTrait) SetWorkloadReference(r corev1.ObjectReference) {
-	tr.Spec.WorkloadReference = r
-}
-
 // GetCondition of this ApplicationConfiguration.
 func (ac *ApplicationConfiguration) GetCondition(ct condition.ConditionType) condition.Condition {
 	return ac.Status.GetCondition(ct)

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

@@ -87,14 +87,6 @@ var (
 	ApplicationConfigurationGroupVersionKind = SchemeGroupVersion.WithKind(ApplicationConfigurationKind)
 )
 
-// ManualScalerTrait type metadata.
-var (
-	ManualScalerTraitKind             = reflect.TypeOf(ManualScalerTrait{}).Name()
-	ManualScalerTraitGroupKind        = schema.GroupKind{Group: Group, Kind: ManualScalerTraitKind}.String()
-	ManualScalerTraitKindAPIVersion   = ManualScalerTraitKind + "." + SchemeGroupVersion.String()
-	ManualScalerTraitGroupVersionKind = SchemeGroupVersion.WithKind(ManualScalerTraitKind)
-)
-
 // HealthScope type metadata.
 var (
 	HealthScopeKind             = reflect.TypeOf(HealthScope{}).Name()
@@ -126,7 +118,6 @@ func init() {
 	SchemeBuilder.Register(&ScopeDefinition{}, &ScopeDefinitionList{})
 	SchemeBuilder.Register(&Component{}, &ComponentList{})
 	SchemeBuilder.Register(&ApplicationConfiguration{}, &ApplicationConfigurationList{})
-	SchemeBuilder.Register(&ManualScalerTrait{}, &ManualScalerTraitList{})
 	SchemeBuilder.Register(&HealthScope{}, &HealthScopeList{})
 	SchemeBuilder.Register(&Application{}, &ApplicationList{})
 	SchemeBuilder.Register(&ApplicationRevision{}, &ApplicationRevisionList{})

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

@@ -1520,97 +1520,6 @@ func (in *HistoryWorkload) DeepCopy() *HistoryWorkload {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ManualScalerTrait) DeepCopyInto(out *ManualScalerTrait) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTrait.
-func (in *ManualScalerTrait) DeepCopy() *ManualScalerTrait {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTrait)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ManualScalerTrait) 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 *ManualScalerTraitList) DeepCopyInto(out *ManualScalerTraitList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]ManualScalerTrait, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitList.
-func (in *ManualScalerTraitList) DeepCopy() *ManualScalerTraitList {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ManualScalerTraitList) 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 *ManualScalerTraitSpec) DeepCopyInto(out *ManualScalerTraitSpec) {
-	*out = *in
-	out.WorkloadReference = in.WorkloadReference
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitSpec.
-func (in *ManualScalerTraitSpec) DeepCopy() *ManualScalerTraitSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ManualScalerTraitStatus) DeepCopyInto(out *ManualScalerTraitStatus) {
-	*out = *in
-	in.ConditionedStatus.DeepCopyInto(&out.ConditionedStatus)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManualScalerTraitStatus.
-func (in *ManualScalerTraitStatus) DeepCopy() *ManualScalerTraitStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(ManualScalerTraitStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MemoryResources) DeepCopyInto(out *MemoryResources) {
 	*out = *in

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

@@ -138,7 +138,8 @@ type TraitDefinitionSpec struct {
 	// +optional
 	ConflictsWith []string `json:"conflictsWith,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the trait
+	// Schematic defines the data format and template of the encapsulation of the trait.
+	// Only CUE and Kube schematic are supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 
@@ -154,14 +155,32 @@ type TraitDefinitionSpec struct {
 	// ManageWorkload defines the trait would be responsible for creating the workload
 	// +optional
 	ManageWorkload bool `json:"manageWorkload,omitempty"`
-	// SkipRevisionAffect defines the update this trait will not generate a new application Revision
-	// +optional
-	SkipRevisionAffect bool `json:"skipRevisionAffect,omitempty"`
 	// ControlPlaneOnly defines which cluster is dispatched to
 	// +optional
 	ControlPlaneOnly bool `json:"controlPlaneOnly,omitempty"`
+
+	// Stage defines the stage information to which this trait resource processing belongs.
+	// Currently, PreDispatch and PostDispatch are provided, which are used to control resource
+	// pre-process and post-process respectively.
+	// +optional
+	Stage StageType `json:"stage,omitempty"`
 }
 
+// StageType describes how the manifests should be dispatched.
+// Only one of the following stage types may be specified.
+// If none of the following types is specified, the default one
+// is DefaultDispatch.
+type StageType string
+
+const (
+	// PreDispatch means that pre dispatch for manifests
+	PreDispatch StageType = "PreDispatch"
+	// DefaultDispatch means that default dispatch for manifests
+	DefaultDispatch StageType = "DefaultDispatch"
+	// PostDispatch means that post dispatch for manifests
+	PostDispatch StageType = "PostDispatch"
+)
+
 // TraitDefinitionStatus is the status of TraitDefinition
 type TraitDefinitionStatus struct {
 	// ConditionedStatus reflects the observed status of a resource

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

@@ -29,7 +29,8 @@ type PolicyDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
 	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the policy definition
+	// Schematic defines the data format and template of the encapsulation of the policy definition.
+	// Only CUE schematic is supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 

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

@@ -29,7 +29,8 @@ type WorkflowStepDefinitionSpec struct {
 	// Reference to the CustomResourceDefinition that defines this trait kind.
 	Reference common.DefinitionReference `json:"definitionRef,omitempty"`
 
-	// Schematic defines the data format and template of the encapsulation of the workflow step definition
+	// Schematic defines the data format and template of the encapsulation of the workflow step definition.
+	// Only CUE schematic is supported for now.
 	// +optional
 	Schematic *common.Schematic `json:"schematic,omitempty"`
 }

apis/types/multicluster.go

@@ -39,4 +39,18 @@ const (
 var (
 	// AnnotationClusterAlias the annotation key for cluster alias
 	AnnotationClusterAlias = config.MetaApiGroupName + "/cluster-alias"
+
+	// AnnotationClusterVersion the annotation key for cluster version
+	AnnotationClusterVersion = config.MetaApiGroupName + "/cluster-version"
 )
+
+// ClusterVersion defines the Version info of managed clusters.
+type ClusterVersion struct {
+	Major      string `json:"major"`
+	Minor      string `json:"minor"`
+	GitVersion string `json:"gitVersion,omitempty"`
+	Platform   string `json:"platform,omitempty"`
+}
+
+// ControlPlaneClusterVersion will be the default value of cluster info if managed cluster version get error, it will have value when vela-core started.
+var ControlPlaneClusterVersion ClusterVersion

apis/types/types.go

@@ -74,9 +74,9 @@ const (
 	AnnoIngressControllerHTTPPort = "ingress.controller/http-port"
 	// AnnoIngressControllerHost define ingress controller externally host
 	AnnoIngressControllerHost = "ingress.controller/host"
-	// LabelConfigType is the label for config type
+	// LabelConfigType is the label marked as the template that generated the config.
 	LabelConfigType = "config.oam.dev/type"
-	// LabelConfigCatalog is the label for config catalog
+	// LabelConfigCatalog is the label marked as the secret generated from the config.
 	LabelConfigCatalog = "config.oam.dev/catalog"
 	// LabelConfigSubType is the sub-type for a config type
 	LabelConfigSubType = "config.oam.dev/sub-type"
@@ -86,10 +86,18 @@ const (
 	LabelConfigSyncToMultiCluster = "config.oam.dev/multi-cluster"
 	// LabelConfigIdentifier is the label for config identifier
 	LabelConfigIdentifier = "config.oam.dev/identifier"
+	// LabelConfigScope is the label for config scope
+	LabelConfigScope = "config.oam.dev/scope"
+	// AnnotationConfigSensitive is the annotation for the sensitization
+	AnnotationConfigSensitive = "config.oam.dev/sensitive"
+	// AnnotationConfigTemplateNamespace is the annotation for the template namespace
+	AnnotationConfigTemplateNamespace = "config.oam.dev/template-namespace"
 	// AnnotationConfigDescription is the annotation for config description
 	AnnotationConfigDescription = "config.oam.dev/description"
 	// AnnotationConfigAlias is the annotation for config alias
 	AnnotationConfigAlias = "config.oam.dev/alias"
+	// AnnotationConfigDistributionSpec is the annotation key of the application that distributes the configs
+	AnnotationConfigDistributionSpec = "config.oam.dev/distribution-spec"
 )
 
 const (
@@ -156,11 +164,13 @@ const (
 	// TerraformProvider is the config type for terraform provider
 	TerraformProvider = "terraform-provider"
 	// DexConnector is the config type for dex connector
-	DexConnector = "config-dex-connector"
+	DexConnector = "dex-connector"
 	// ImageRegistry is the config type for image registry
-	ImageRegistry = "config-image-registry"
+	ImageRegistry = "image-registry"
 	// HelmRepository is the config type for Helm chart repository
-	HelmRepository = "config-helm-repository"
+	HelmRepository = "helm-repository"
+	// CatalogConfigDistribution is the catalog type
+	CatalogConfigDistribution = "config-distribution"
 )
 
 const (

charts/vela-core/README.md

@@ -97,6 +97,7 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai
 | `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

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

@@ -2209,10 +2209,11 @@ spec:
                               execution
                             properties:
                               steps:
-                                description: WorkflowMode describes the mode of workflow
+                                description: Steps is the mode of workflow steps execution
                                 type: string
                               subSteps:
-                                description: WorkflowMode describes the mode of workflow
+                                description: SubSteps is the mode of workflow sub
+                                  steps execution
                                 type: string
                             type: object
                           ref:
@@ -3305,7 +3306,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the policy definition
+                            of the encapsulation of the policy definition. Only CUE
+                            schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3731,7 +3733,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the trait
+                            of the encapsulation of the trait. Only CUE and Kube schematic
+                            are supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3885,10 +3888,12 @@ spec:
                               - configuration
                               type: object
                           type: object
-                        skipRevisionAffect:
-                          description: SkipRevisionAffect defines the update this
-                            trait will not generate a new application Revision
-                          type: boolean
+                        stage:
+                          description: Stage defines the stage information to which
+                            this trait resource processing belongs. Currently, PreDispatch
+                            and PostDispatch are provided, which are used to control
+                            resource pre-process and post-process respectively.
+                          type: string
                         status:
                           description: Status defines the custom health policy and
                             status message for trait
@@ -4004,6 +4009,17 @@ spec:
                       namespace:
                         type: string
                     type: object
+                  mode:
+                    description: WorkflowExecuteMode defines the mode of workflow
+                      execution
+                    properties:
+                      steps:
+                        description: Steps is the mode of workflow steps execution
+                        type: string
+                      subSteps:
+                        description: SubSteps is the mode of workflow sub steps execution
+                        type: string
+                    type: object
                   steps:
                     items:
                       description: WorkflowStep defines how to execute a workflow
@@ -4190,7 +4206,8 @@ spec:
                           type: object
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the workflow step definition
+                            of the encapsulation of the workflow step definition.
+                            Only CUE schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format

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

@@ -1020,10 +1020,10 @@ spec:
                       execution
                     properties:
                       steps:
-                        description: WorkflowMode describes the mode of workflow
+                        description: Steps is the mode of workflow steps execution
                         type: string
                       subSteps:
-                        description: WorkflowMode describes the mode of workflow
+                        description: SubSteps is the mode of workflow sub steps execution
                         type: string
                     type: object
                   ref:

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

@@ -445,7 +445,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the policy definition
+                          of the encapsulation of the policy definition. Only CUE
+                          schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -762,7 +763,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the trait
+                          of the encapsulation of the trait. Only CUE and Kube schematic
+                          are supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -914,10 +916,12 @@ spec:
                             - configuration
                             type: object
                         type: object
-                      skipRevisionAffect:
-                        description: SkipRevisionAffect defines the update this trait
-                          will not generate a new application Revision
-                        type: boolean
+                      stage:
+                        description: Stage defines the stage information to which
+                          this trait resource processing belongs. Currently, PreDispatch
+                          and PostDispatch are provided, which are used to control
+                          resource pre-process and post-process respectively.
+                        type: string
                       status:
                         description: Status defines the custom health policy and status
                           message for trait
@@ -1052,7 +1056,8 @@ spec:
                         type: object
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the workflow step definition
+                          of the encapsulation of the workflow step definition. Only
+                          CUE schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format

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

@@ -1,134 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
-  name: manualscalertraits.core.oam.dev
-spec:
-  group: core.oam.dev
-  names:
-    categories:
-    - oam
-    kind: ManualScalerTrait
-    listKind: ManualScalerTraitList
-    plural: manualscalertraits
-    singular: manualscalertrait
-  scope: Namespaced
-  versions:
-  - name: v1alpha2
-    schema:
-      openAPIV3Schema:
-        description: A ManualScalerTrait determines how many replicas a workload should
-          have.
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: A ManualScalerTraitSpec defines the desired state of a ManualScalerTrait.
-            properties:
-              replicaCount:
-                description: ReplicaCount of the workload this trait applies to.
-                format: int32
-                type: integer
-              workloadRef:
-                description: WorkloadReference to the workload this trait applies
-                  to.
-                properties:
-                  apiVersion:
-                    description: API version of the referent.
-                    type: string
-                  fieldPath:
-                    description: 'If referring to a piece of an object instead of
-                      an entire object, this string should contain a valid JSON/Go
-                      field access statement, such as desiredState.manifest.containers[2].
-                      For example, if the object reference is to a container within
-                      a pod, this would take on a value like: "spec.containers{name}"
-                      (where "name" refers to the name of the container that triggered
-                      the event) or if no container name is specified "spec.containers[2]"
-                      (container with index 2 in this pod). This syntax is chosen
-                      only to have some well-defined way of referencing a part of
-                      an object. TODO: this design is not final and this field is
-                      subject to change in the future.'
-                    type: string
-                  kind:
-                    description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  name:
-                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                    type: string
-                  namespace:
-                    description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                    type: string
-                  resourceVersion:
-                    description: 'Specific resourceVersion to which this reference
-                      is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                    type: string
-                  uid:
-                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                    type: string
-                type: object
-            required:
-            - replicaCount
-            - workloadRef
-            type: object
-          status:
-            description: A ManualScalerTraitStatus represents the observed state of
-              a ManualScalerTrait.
-            properties:
-              conditions:
-                description: Conditions of the resource.
-                items:
-                  description: A Condition that may apply to a resource.
-                  properties:
-                    lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
-                      type: string
-                    reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
-                      type: string
-                    status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
-                      type: string
-                    type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -60,7 +60,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the policy definition
+                  encapsulation of the policy definition. Only CUE schematic is supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -410,7 +410,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the trait
+                  encapsulation of the trait. Only CUE and Kube schematic are supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format
@@ -557,10 +558,12 @@ spec:
                     - configuration
                     type: object
                 type: object
-              skipRevisionAffect:
-                description: SkipRevisionAffect defines the update this trait will
-                  not generate a new application Revision
-                type: boolean
+              stage:
+                description: Stage defines the stage information to which this trait
+                  resource processing belongs. Currently, PreDispatch and PostDispatch
+                  are provided, which are used to control resource pre-process and
+                  post-process respectively.
+                type: string
               status:
                 description: Status defines the custom health policy and status message
                   for trait

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

@@ -1,10 +1,10 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.2
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
   name: workflows.core.oam.dev
 spec:
   group: core.oam.dev
@@ -34,6 +34,16 @@ spec:
             type: string
           metadata:
             type: object
+          mode:
+            description: WorkflowExecuteMode defines the mode of workflow execution
+            properties:
+              steps:
+                description: Steps is the mode of workflow steps execution
+                type: string
+              subSteps:
+                description: SubSteps is the mode of workflow sub steps execution
+                type: string
+            type: object
           steps:
             items:
               description: WorkflowStep defines how to execute a workflow step.
@@ -161,153 +171,3 @@ spec:
         type: object
     served: true
     storage: true
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: Workflow defines workflow steps and other attributes
-        properties:
-          mode:
-            description: WorkflowExecuteMode defines the mode of workflow execution
-            properties:
-              steps:
-                description: WorkflowMode describes the mode of workflow
-                type: string
-              subSteps:
-                description: WorkflowMode describes the mode of workflow
-                type: string
-            type: object
-          ref:
-            type: string
-          steps:
-            items:
-              description: WorkflowStep defines how to execute a workflow step.
-              properties:
-                dependsOn:
-                  description: DependsOn is the dependency of the step
-                  items:
-                    type: string
-                  type: array
-                if:
-                  description: If is the if condition of the step
-                  type: string
-                inputs:
-                  description: Inputs is the inputs of the step
-                  items:
-                    properties:
-                      from:
-                        type: string
-                      parameterKey:
-                        type: string
-                    required:
-                    - from
-                    - parameterKey
-                    type: object
-                  type: array
-                meta:
-                  description: Meta is the meta data of the workflow step.
-                  properties:
-                    alias:
-                      type: string
-                  type: object
-                name:
-                  description: Name is the unique name of the workflow step.
-                  type: string
-                outputs:
-                  description: Outputs is the outputs of the step
-                  items:
-                    properties:
-                      name:
-                        type: string
-                      valueFrom:
-                        type: string
-                    required:
-                    - name
-                    - valueFrom
-                    type: object
-                  type: array
-                properties:
-                  description: Properties is the properties of the step
-                  type: object
-                  x-kubernetes-preserve-unknown-fields: true
-                subSteps:
-                  items:
-                    description: WorkflowStepBase defines the workflow step base
-                    properties:
-                      dependsOn:
-                        description: DependsOn is the dependency of the step
-                        items:
-                          type: string
-                        type: array
-                      if:
-                        description: If is the if condition of the step
-                        type: string
-                      inputs:
-                        description: Inputs is the inputs of the step
-                        items:
-                          properties:
-                            from:
-                              type: string
-                            parameterKey:
-                              type: string
-                          required:
-                          - from
-                          - parameterKey
-                          type: object
-                        type: array
-                      meta:
-                        description: Meta is the meta data of the workflow step.
-                        properties:
-                          alias:
-                            type: string
-                        type: object
-                      name:
-                        description: Name is the unique name of the workflow step.
-                        type: string
-                      outputs:
-                        description: Outputs is the outputs of the step
-                        items:
-                          properties:
-                            name:
-                              type: string
-                            valueFrom:
-                              type: string
-                          required:
-                          - name
-                          - valueFrom
-                          type: object
-                        type: array
-                      properties:
-                        description: Properties is the properties of the step
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                      timeout:
-                        description: Timeout is the timeout of the step
-                        type: string
-                      type:
-                        description: Type is the type of the workflow step.
-                        type: string
-                    required:
-                    - name
-                    - type
-                    type: object
-                  type: array
-                timeout:
-                  description: Timeout is the timeout of the step
-                  type: string
-                type:
-                  description: Type is the type of the workflow step.
-                  type: string
-              required:
-              - name
-              - type
-              type: object
-            type: array
-        type: object
-    served: true
-    storage: false
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

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

@@ -57,7 +57,8 @@ spec:
                 type: object
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the workflow step definition
+                  encapsulation of the workflow step definition. Only CUE schematic
+                  is supported for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: annotations: {
         		for k, v in parameter {
-        			"\(k)": v
+        			(k): v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: annotations: {
         			for k, v in parameter {
-        				"\(k)": v
+        				(k): v
         			}
         		}
         	}

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

@@ -12,6 +12,8 @@ spec:
     cue:
       template: |
         #ApplyOnceStrategy: {
+        	// +usage=When the strategy takes effect,e.g. onUpdate、onStateKeep
+        	affect?: string
         	// +usage=Specify the path of the resource that allow configuration drift
         	path: [...string]
         }

charts/vela-core/templates/defwithtemplate/collect-service-endpoints.yaml

@@ -14,6 +14,7 @@ spec:
         import (
         	"vela/op"
         	"vela/ql"
+        	"strconv"
         )
 
         collect: ql.#CollectServiceEndpoints & {
@@ -34,13 +35,22 @@ spec:
         	}
         } @step(1)
         outputs: {
-        	eps: *[] | [...]
+        	eps_port_name_filtered: *[] | [...]
+        	if parameter.portName == _|_ {
+        		eps_port_name_filtered: collect.list
+        	}
+        	if parameter.portName != _|_ {
+        		eps_port_name_filtered: [ for ep in collect.list if parameter.portName == ep.endpoint.portName {ep}]
+        	}
+
+        	eps_port_filtered: *[] | [...]
         	if parameter.port == _|_ {
-        		eps: collect.list
+        		eps_port_filtered: eps_port_name_filtered
         	}
         	if parameter.port != _|_ {
-        		eps: [ for ep in collect.list if parameter.port == ep.endpoint.port {ep}]
+        		eps_port_filtered: [ for ep in eps_port_name_filtered if parameter.port == ep.endpoint.port {ep}]
         	}
+        	eps:       eps_port_filtered
         	endpoints: *[] | [...]
         	if parameter.outer != _|_ {
         		tmps: [ for ep in eps {
@@ -55,7 +65,7 @@ spec:
         		endpoints: [ for ep in tmps if (!parameter.outer || ep.outer) {ep}]
         	}
         	if parameter.outer == _|_ {
-        		endpoints: eps
+        		endpoints: eps_port_filtered
         	}
         }
         wait: op.#ConditionalWait & {
@@ -63,7 +73,9 @@ spec:
         } @step(2)
         value: {
         	if len(outputs.endpoints) > 0 {
-        		outputs.endpoints[0]
+        		endpoint: outputs.endpoints[0].endpoint
+        		_portStr: strconv.FormatInt(endpoint.port, 10)
+        		url:      "\(parameter.protocal)://\(endpoint.host):\(_portStr)"
         	}
         }
         parameter: {
@@ -75,7 +87,11 @@ spec:
         	components?: [...string]
         	// +usage=Filter the port of the endpoints
         	port?: int
+        	// +usage=Filter the port name of the endpoints
+        	portName?: string
         	// +usage=Filter the endpoint that are only outer
         	outer?: bool
+        	// +usage=The protocal of endpoint url
+        	protocal: *"http" | "https"
         }
 

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

@@ -48,7 +48,7 @@ spec:
         		}
         		_delArgs: {...}
         		if _params.delArgs != null {
-        			_delArgs: {for k in _params.delArgs {"\(k)": ""}}
+        			_delArgs: {for k in _params.delArgs {(k): ""}}
         		}
         		if _params.delArgs == null {
         			_delArgs: {}
@@ -63,7 +63,7 @@ spec:
         		if _params.args == null && _baseContainer.args == _|_ {
         			_args: []
         		}
-        		_argsMap: {for a in _args {"\(a)": ""}}
+        		_argsMap: {for a in _args {(a): ""}}
         		_addArgs: [...string]
         		if _params.addArgs != null {
         			_addArgs: _params.addArgs

charts/vela-core/templates/defwithtemplate/config-image-registry.yaml

@@ -1,86 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/internal/config-image-registry.cue
-apiVersion: core.oam.dev/v1beta1
-kind: ComponentDefinition
-metadata:
-  annotations:
-    alias.config.oam.dev: Image Registry
-    definition.oam.dev/description: Config information to authenticate image registry
-  labels:
-    catalog.config.oam.dev: velacore-config
-    custom.definition.oam.dev/ui-hidden: "true"
-    multi-cluster.config.oam.dev: "true"
-    type.config.oam.dev: image-registry
-  name: config-image-registry
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"encoding/base64"
-        	"encoding/json"
-        	"strconv"
-        )
-
-        output: {
-        	apiVersion: "v1"
-        	kind:       "Secret"
-        	metadata: {
-        		name:      context.name
-        		namespace: context.namespace
-        		labels: {
-        			"config.oam.dev/catalog":       "velacore-config"
-        			"config.oam.dev/type":          "image-registry"
-        			"config.oam.dev/multi-cluster": "true"
-        			"config.oam.dev/identifier":    parameter.registry
-        			"config.oam.dev/sub-type":      "auth"
-        		}
-        	}
-        	if parameter.auth != _|_ {
-        		type: "kubernetes.io/dockerconfigjson"
-        	}
-        	if parameter.auth == _|_ {
-        		type: "Opaque"
-        	}
-        	stringData: {
-        		if parameter.auth != _|_ && parameter.auth.username != _|_ {
-        			".dockerconfigjson": json.Marshal({
-        				auths: "\(parameter.registry)": {
-        					username: parameter.auth.username
-        					password: parameter.auth.password
-        					if parameter.auth.email != _|_ {
-        						email: parameter.auth.email
-        					}
-        					auth: base64.Encode(null, (parameter.auth.username + ":" + parameter.auth.password))
-        				}
-        			})
-        		}
-        		if parameter.insecure != _|_ {
-        			"insecure-skip-verify": strconv.FormatBool(parameter.insecure)
-        		}
-        		if parameter.useHTTP != _|_ {
-        			"protocol-use-http": strconv.FormatBool(parameter.useHTTP)
-        		}
-        	}
-        }
-        parameter: {
-        	// +usage=Image registry FQDN, such as: index.docker.io
-        	registry: string
-        	// +usage=Authenticate the image registry
-        	auth?: {
-        		// +usage=Private Image registry username
-        		username: string
-        		// +usage=Private Image registry password
-        		password: string
-        		// +usage=Private Image registry email
-        		email?: string
-        	}
-        	// +usage=For the registry server that uses the self-signed certificate
-        	insecure?: bool
-        	// +usage=For the registry server that uses the HTTP protocol
-        	useHTTP?: bool
-        }
-  workload:
-    type: autodetects.core.oam.dev
-

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

@@ -42,7 +42,7 @@ spec:
         outputs: {
         	for v in parameter.volumes {
         		if v.data != _|_ {
-        			"\(v.name)": {
+        			(v.name): {
         				apiVersion: "v1"
         				kind:       "ConfigMap"
         				metadata: name: v.name

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

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

charts/vela-core/templates/defwithtemplate/create-config.yaml

@@ -0,0 +1,44 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/create-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Create or update a config
+  name: create-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        deploy: op.#CreateConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        	if parameter.template != _|_ {
+        		template: parameter.template
+        	}
+        	config: parameter.config
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+
+        	//+usage=Specify the template of the config.
+        	template?: string
+
+        	//+usage=Specify the content of the config.
+        	config: {...}
+        }
+

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

@@ -15,116 +15,117 @@ spec:
         	"strconv"
         )
 
-        mountsArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        mountsArray: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				mountPath: v.mountPath
-        				if v.mountPropagation != _|_ {
-        					mountPropagation: v.mountPropagation
-        				}
-        				name: v.name
-        				if v.readOnly != _|_ {
-        					readOnly: v.readOnly
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
+        			}
+        			name: v.name
+        		}
+        	},
+        ]
+        volumesList: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			name: v.name
+        			persistentVolumeClaim: claimName: v.claimName
+        		}
+        	},
+
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			name: v.name
+        			configMap: {
+        				defaultMode: v.defaultMode
+        				name:        v.cmName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
-        }
-        volumesArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				name: v.name
-        				persistentVolumeClaim: claimName: v.claimName
-        			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				name: v.name
-        				configMap: {
-        					defaultMode: v.defaultMode
-        					name:        v.cmName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			name: v.name
+        			secret: {
+        				defaultMode: v.defaultMode
+        				secretName:  v.secretName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				name: v.name
-        				secret: {
-        					defaultMode: v.defaultMode
-        					secretName:  v.secretName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
-        				}
-        			}
-        		},
-        	] | []
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			name: v.name
+        			emptyDir: medium: v.medium
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				name: v.name
-        				emptyDir: medium: v.medium
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			name: v.name
+        			hostPath: 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
         		},
-        	] | []
-
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				name: v.name
-        				hostPath: path: v.path
-        			}
-        		},
-        	] | []
-        }
+        	] if val._ignore == _|_ {
+        		val
+        	},
+        ]
         output: {
         	apiVersion: "apps/v1"
         	kind:       "DaemonSet"
@@ -210,7 +211,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
+        						volumeMounts: mountsArray
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -268,7 +269,7 @@ spec:
         				}
 
         				if parameter["volumeMounts"] != _|_ {
-        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
+        					volumes: deDupVolumesArray
         				}
         			}
         		}

charts/vela-core/templates/defwithtemplate/delete-config.yaml

@@ -0,0 +1,34 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/delete-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Delete a config
+  name: delete-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        deploy: op.#DeleteConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

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

@@ -19,11 +19,11 @@ spec:
         )
 
         app: op.#Steps & {
-        	load: op.#Load @step(1)
+        	load: op.#Load
         	clusters: [...string]
-        	listClusters: op.#ListClusters @step(2)
         	if parameter.clusters == _|_ {
-        		clusters: listClusters.outputs.clusters
+        		listClusters: op.#ListClusters
+        		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
         		clusters: parameter.clusters
@@ -38,7 +38,7 @@ spec:
         				}
         			}
         		}
-        	} @step(3)
+        	}
         }
         parameter: {
         	// +usage=Declare the runtime clusters to apply, if empty, all runtime clusters will be used

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

@@ -29,7 +29,7 @@ spec:
         PatchContainer: {
         	_params: #PatchParams
         	name:    _params.containerName
-        	_delKeys: {for k in _params.unset {"\(k)": ""}}
+        	_delKeys: {for k in _params.unset {(k): ""}}
         	_baseContainers: context.output.spec.template.spec.containers
         	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
         	_baseContainer: *_|_ | {...}
@@ -47,7 +47,7 @@ spec:
         			}]
         		}
         		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar}}
+        			_baseEnvMap: {for envVar in _baseEnv {(envVar.name): envVar}}
         			// +patchStrategy=replace
         			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
         				name: envVar.name

charts/vela-core/templates/defwithtemplate/export-data.yaml

@@ -43,7 +43,7 @@ spec:
         }      @step(2)
         apply: op.#Steps & {
         	for p in getPlacements.placements {
-        		"\(p.cluster)": op.#Apply & {
+        		(p.cluster): op.#Apply & {
         			value:   object
         			cluster: p.cluster
         		}

charts/vela-core/templates/defwithtemplate/export-service.yaml

@@ -0,0 +1,79 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export-service.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export service to clusters specified by topology.
+  name: export-service
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        meta: {
+        	name:      *context.name | string
+        	namespace: *context.namespace | string
+        	if parameter.name != _|_ {
+        		name: parameter.name
+        	}
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        }
+        objects: [{
+        	apiVersion: "v1"
+        	kind:       "Service"
+        	metadata:   meta
+        	spec: {
+        		type: "ClusterIP"
+        		ports: [{
+        			protocol:   "TCP"
+        			port:       parameter.port
+        			targetPort: parameter.targetPort
+        		}]
+        	}
+        }, {
+        	apiVersion: "v1"
+        	kind:       "Endpoints"
+        	metadata:   meta
+        	subsets: [{
+        		addresses: [{ip: parameter.ip}]
+        		ports: [{port: parameter.targetPort}]
+        	}]
+        }] @step(1)
+        getPlacements: op.#GetPlacementsFromTopologyPolicies & {
+        	policies: *[] | [...string]
+        	if parameter.topology != _|_ {
+        		policies: [parameter.topology]
+        	}
+        }      @step(2)
+        apply: op.#Steps & {
+        	for p in getPlacements.placements {
+        		for o in objects {
+        			"\(p.cluster)-\(o.kind)": op.#Apply & {
+        				value:   o
+        				cluster: p.cluster
+        			}
+        		}
+        	}
+        } @step(3)
+        parameter: {
+        	// +usage=Specify the name of the export destination
+        	name?: string
+        	// +usage=Specify the namespace of the export destination
+        	namespace?: string
+        	// +usage=Specify the ip to be export
+        	ip: string
+        	// +usage=Specify the port to be used in service
+        	port: int
+        	// +usage=Specify the port to be export
+        	targetPort: int
+        	// +usage=Specify the topology to export
+        	topology?: string
+        }
+

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

@@ -30,9 +30,15 @@ spec:
         		]
         	}
         }
+        legacyAPI: context.clusterVersion.minor < 19
         outputs: ingress: {
-        	apiVersion: "networking.k8s.io/v1"
-        	kind:       "Ingress"
+        	if legacyAPI {
+        		apiVersion: "networking.k8s.io/v1beta1"
+        	}
+        	if !legacyAPI {
+        		apiVersion: "networking.k8s.io/v1"
+        	}
+        	kind: "Ingress"
         	metadata: {
         		name: context.name
         		annotations: {
@@ -64,9 +70,17 @@ spec:
         				for k, v in parameter.http {
         					path:     k
         					pathType: "ImplementationSpecific"
-        					backend: service: {
-        						name: context.name
-        						port: number: v
+        					backend: {
+        						if legacyAPI {
+        							serviceName: context.name
+        							servicePort: v
+        						}
+        						if !legacyAPI {
+        							service: {
+        								name: context.name
+        								port: number: v
+        							}
+        						}
         					}
         				},
         			]
@@ -104,7 +118,7 @@ spec:
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
         	}
         }
         if igs[0].ip == _|_ {

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

@@ -28,8 +28,9 @@ spec:
         		}]
         	}]
         	initContainers: [{
-        		name:  parameter.name
-        		image: parameter.image
+        		name:            parameter.name
+        		image:           parameter.image
+        		imagePullPolicy: parameter.imagePullPolicy
         		if parameter.cmd != _|_ {
         			command: parameter.cmd
         		}
@@ -59,6 +60,9 @@ spec:
         	// +usage=Specify the image of init container
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
+
         	// +usage=Specify the commands run in the init container
         	cmd?: [...string]
 

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: labels: {
         		for k, v in parameter {
-        			"\(k)": v
+        			(k): v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: labels: {
         			for k, v in parameter {
-        				"\(k)": v
+        				(k): v
         			}
         		}
         	}

charts/vela-core/templates/defwithtemplate/list-config.yaml

@@ -0,0 +1,33 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/list-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: List the configs
+  name: list-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ListConfig & {
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        	template: parameter.template
+        }
+        parameter: {
+        	//+usage=Specify the template of the config.
+        	template: string
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

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

@@ -108,7 +108,7 @@ spec:
         						portForward: parameter.portForward
         					}
         					if parameter.portForward == _|_ {
-        						portForward: ["\(parameter.port)" + ":" + "\(parameter.port)"]
+        						portForward: ["\(parameter.port):\(parameter.port)"]
         					}
         				}
         			},

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

@@ -20,10 +20,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send Lark messages
         	lark?: {
         		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -42,10 +42,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send DingTalk messages
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -100,10 +100,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send Slack messages
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -134,10 +134,10 @@ spec:
         			// +usage=The alias is the email alias to show after sending the email
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
-        			password: {
+        			password: close({
         				// +usage=the password content in string
         				value: string
-        			} | close({
+        			}) | close({
         				secretRef: {
         					// +usage=name is the name of the secret
         					name: string
@@ -201,20 +201,10 @@ spec:
         	verbatim?: bool
         }
         option: {
-        	text: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	value: string
-        	description?: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	url?: string
+        	text:         textType
+        	value:        string
+        	description?: textType
+        	url?:         string
         }
         // send webhook notification
         ding: op.#Steps & {
@@ -237,8 +227,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])}
         			ding2:       op.#DingTalk & {
         				message: parameter.dingding.message
         				dingUrl: stringValue.str
@@ -266,8 +255,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])}
         			lark2:       op.#Lark & {
         				message: parameter.lark.message
         				larkUrl: stringValue.str
@@ -295,8 +283,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])}
         			slack2:      op.#Slack & {
         				message:  parameter.slack.message
         				slackUrl: stringValue.str
@@ -334,8 +321,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])}
         			email2:      op.#SendEmail & {
         				from: {
         					address: parameter.email.from.address

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

@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/print-message-in-status.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: pring message in workflow status
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: print-message-in-status
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        parameter: message: string
+        msg: op.#Message & {
+        	message: parameter.message
+        }
+

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

@@ -52,7 +52,7 @@ spec:
         		},
         	]
         }
-        outputs: "\(parameter.claimName)": {
+        outputs: claim: {
         	apiVersion: "v1"
         	kind:       "PersistentVolumeClaim"
         	metadata: name: parameter.claimName
@@ -67,7 +67,7 @@ spec:
         			storageClassName: parameter.storageClassName
         		}
         		resources: requests: storage: parameter.resources.requests.storage
-        		if parameter.resources.limits.storage != _|_ {
+        		if parameter.resources.limits != _|_ {
         			resources: limits: storage: parameter.resources.limits.storage
         		}
         		if parameter.dataSourceRef != _|_ {

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

@@ -0,0 +1,34 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/read-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Read a config
+  name: read-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ReadConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

charts/vela-core/templates/defwithtemplate/service-account.yaml

@@ -85,7 +85,7 @@ spec:
         				subjects: [{
         					kind:      "ServiceAccount"
         					name:      parameter.name
-        					namespace: "\(context.namespace)"
+        					namespace: (context.namespace)
         				}]
         			}
         		}

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

@@ -17,16 +17,14 @@ spec:
   schematic:
     cue:
       template: |
-        pvcVolumesList: *[
-        		if parameter.pvc != _|_ for v in parameter.pvc {
+        volumesList: [
+        	if parameter.pvc != _|_ for v in parameter.pvc {
         		{
         			name: "pvc-" + v.name
         			persistentVolumeClaim: claimName: v.name
         		}
         	},
-        ] | []
-        configMapVolumesList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name: "configmap-" + v.name
         			configMap: {
@@ -38,9 +36,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        secretVolumesList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name: "secret-" + v.name
         			secret: {
@@ -52,17 +48,15 @@ spec:
         			}
         		}
         	},
-        ] | []
-        emptyDirVolumesList: *[
-        			if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
         		{
         			name: "emptydir-" + v.name
         			emptyDir: medium: v.medium
         		}
         	},
-        ] | []
-        pvcVolumeMountsList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc {
+        ]
+        volumeMountsList: [
+        	if parameter.pvc != _|_ for v in parameter.pvc {
         		if v.volumeMode == "Filesystem" {
         			{
         				name:      "pvc-" + v.name
@@ -73,9 +67,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        configMapVolumeMountsList: *[
-        				if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name:      "configmap-" + v.name
         			mountPath: v.mountPath
@@ -84,31 +76,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        configMapEnvMountsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
-        		{
-        			name: v.mountToEnv.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  v.mountToEnv.configMapKey
-        			}
-        		}
-        	},
-        ] | []
-        configMountToEnvsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  k.configMapKey
-        			}
-        		}
-        	},
-        ] | []
-        secretVolumeMountsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name:      "secret-" + v.name
         			mountPath: v.mountPath
@@ -117,31 +85,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        secretEnvMountsList: *[
-        			if parameter.secret != _|_ if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
-        		{
-        			name: v.mountToEnv.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  v.mountToEnv.secretKey
-        			}
-        		}
-        	},
-        ] | []
-        secretMountToEnvsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  k.secretKey
-        			}
-        		}
-        	},
-        ] | []
-        emptyDirVolumeMountsList: *[
-        				if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
         		{
         			name:      "emptydir-" + v.name
         			mountPath: v.mountPath
@@ -150,9 +94,47 @@ spec:
         			}
         		}
         	},
-        ] | []
+        ]
+        envList: [
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
+        		{
+        			name: v.mountToEnv.envName
+        			valueFrom: configMapKeyRef: {
+        				name: v.name
+        				key:  v.mountToEnv.configMapKey
+        			}
+        		}
+        	},
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        		{
+        			name: k.envName
+        			valueFrom: configMapKeyRef: {
+        				name: v.name
+        				key:  k.configMapKey
+        			}
+        		}
+        	},
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
+        		{
+        			name: v.mountToEnv.envName
+        			valueFrom: secretKeyRef: {
+        				name: v.name
+        				key:  v.mountToEnv.secretKey
+        			}
+        		}
+        	},
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        		{
+        			name: k.envName
+        			valueFrom: secretKeyRef: {
+        				name: v.name
+        				key:  k.secretKey
+        			}
+        		}
+        	},
+        ]
         volumeDevicesList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc if v.volumeMode == "Block" {
+        			for v in parameter.pvc if v.volumeMode == "Block" {
         		{
         			name:       "pvc-" + v.name
         			devicePath: v.mountPath
@@ -162,7 +144,6 @@ spec:
         		}
         	},
         ] | []
-        volumesList: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList
         deDupVolumesArray: [
         	for val in [
         		for i, vi in volumesList {
@@ -181,16 +162,16 @@ spec:
 
         	containers: [{
         		// +patchKey=name
-        		env: configMapEnvMountsList + secretEnvMountsList + configMountToEnvsList + secretMountToEnvsList
+        		env: envList
         		// +patchKey=name
         		volumeDevices: volumeDevicesList
         		// +patchKey=name
-        		volumeMounts: pvcVolumeMountsList + configMapVolumeMountsList + secretVolumeMountsList + emptyDirVolumeMountsList
+        		volumeMounts: volumeMountsList
         	}, ...]
 
         }
         outputs: {
-        	if parameter.pvc != _|_ for v in parameter.pvc {
+        	for v in parameter.pvc {
         		if v.mountOnly == false {
         			"pvc-\(v.name)": {
         				apiVersion: "v1"
@@ -229,7 +210,7 @@ spec:
         		}
         	}
 
-        	if parameter.configMap != _|_ for v in parameter.configMap {
+        	for v in parameter.configMap {
         		if v.mountOnly == false {
         			"configmap-\(v.name)": {
         				apiVersion: "v1"
@@ -242,7 +223,7 @@ spec:
         		}
         	}
 
-        	if parameter.secret != _|_ for v in parameter.secret {
+        	for v in parameter.secret {
         		if v.mountOnly == false {
         			"secret-\(v.name)": {
         				apiVersion: "v1"

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

@@ -63,7 +63,7 @@ spec:
         					}
 
         					if parameter["volumes"] != _|_ {
-        						volumeMounts: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        						volumeMounts: [ for v in parameter.volumes {
         							{
         								mountPath: v.mountPath
         								name:      v.name
@@ -72,7 +72,7 @@ spec:
         				}]
 
         				if parameter["volumes"] != _|_ {
-        					volumes: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        					volumes: [ for v in parameter.volumes {
         						{
         							name: v.name
         							if v.type == "pvc" {
@@ -103,7 +103,7 @@ spec:
         				}
 
         				if parameter["imagePullSecrets"] != _|_ {
-        					imagePullSecrets: [ if parameter.imagePullSecrets != _|_ for v in parameter.imagePullSecrets {
+        					imagePullSecrets: [ for v in parameter.imagePullSecrets {
         						name: v
         					},
         					]

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

@@ -16,6 +16,8 @@ spec:
         	clusters?: [...string]
         	// +usage=Specify the label selector for clusters
         	clusterLabelSelector?: [string]: string
+        	// +usage=Ignore empty cluster error
+        	allowEmpty?: bool
         	// +usage=Deprecated: Use clusterLabelSelector instead.
         	clusterSelector?: [string]: string
         	// +usage=Specify the target namespace to deploy in the selected clusters, default inherit the original namespace.

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

@@ -19,7 +19,7 @@ spec:
         patch: {
         	// +patchKey=name
         	spec: template: spec: volumes: [
-        		for v in parameter.volumes {
+        		if parameter.volumes != _|_ for v in parameter.volumes {
         			{
         				name: v.name
         				if v.type == "pvc" {

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

@@ -1,259 +0,0 @@
-# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
-# Definition source cue file: vela-templates/definitions/deprecated/webhook-notification.cue
-apiVersion: core.oam.dev/v1beta1
-kind: WorkflowStepDefinition
-metadata:
-  annotations:
-    definition.oam.dev/description: Send message to webhook. This definition is DEPRECATED, please use 'notification' instead.
-  labels:
-    custom.definition.oam.dev/deprecated: "true"
-  name: webhook-notification
-  namespace: {{ include "systemDefinitionNamespace" . }}
-spec:
-  schematic:
-    cue:
-      template: |
-        import (
-        	"vela/op"
-        	"encoding/base64"
-        )
-
-        parameter: {
-        	dingding?: {
-        		url: value | secretRef
-        		message: {
-        			text?: *null | {
-        				content: string
-        			}
-        			// +usage=msgType can be text, link, mardown, actionCard, feedCard
-        			msgtype: string
-        			link?:   *null | {
-        				text?:       string
-        				title?:      string
-        				messageUrl?: string
-        				picUrl?:     string
-        			}
-        			markdown?: *null | {
-        				text:  string
-        				title: string
-        			}
-        			at?: *null | {
-        				atMobiles?: *null | [...string]
-        				isAtAll?:   bool
-        			}
-        			actionCard?: *null | {
-        				text:           string
-        				title:          string
-        				hideAvatar:     string
-        				btnOrientation: string
-        				singleTitle:    string
-        				singleURL:      string
-        				btns:           *null | [...*null | {
-        					title:     string
-        					actionURL: string
-        				}]
-        			}
-        			feedCard?: *null | {
-        				links: *null | [...*null | {
-        					text?:       string
-        					title?:      string
-        					messageUrl?: string
-        					picUrl?:     string
-        				}]
-        			}
-        		}
-        	}
-
-        	slack?: {
-        		url: value | secretRef
-        		message: {
-        			text:         string
-        			blocks?:      *null | [...block]
-        			attachments?: *null | {
-        				blocks?: *null | [...block]
-        				color?:  string
-        			}
-        			thread_ts?: string
-        			mrkdwn?:    *true | bool
-        		}
-        	}
-
-        	email?: {
-        		from: {
-        			address:  string
-        			alias?:   string
-        			password: value | secretRef
-        			host:     string
-        			port:     *587 | int
-        		}
-        		to: [...string]
-        		content: {
-        			subject: string
-        			body:    string
-        		}
-        	}
-        }
-        block: {
-        	type:      string
-        	block_id?: string
-        	elements?: [...{
-        		type:       string
-        		action_id?: string
-        		url?:       string
-        		value?:     string
-        		style?:     string
-        		text?:      textType
-        		confirm?: {
-        			title:   textType
-        			text:    textType
-        			confirm: textType
-        			deny:    textType
-        			style?:  string
-        		}
-        		options?: [...option]
-        		initial_options?: [...option]
-        		placeholder?:  textType
-        		initial_date?: string
-        		image_url?:    string
-        		alt_text?:     string
-        		option_groups?: [...option]
-        		max_selected_items?: int
-        		initial_value?:      string
-        		multiline?:          bool
-        		min_length?:         int
-        		max_length?:         int
-        		dispatch_action_config?: trigger_actions_on?: [...string]
-        		initial_time?: string
-        	}]
-        }
-        textType: {
-        	type:      string
-        	text:      string
-        	emoji?:    bool
-        	verbatim?: bool
-        }
-        option: {
-        	text: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	value: string
-        	description?: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	url?: string
-        }
-        secretRef: {
-        	name: string
-        	key:  string
-        }
-        value: string
-        // send webhook notification
-        ding: op.#Steps & {
-        	if parameter.dingding != _|_ {
-        		if parameter.dingding.url.value != _|_ {
-        			ding1: op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: parameter.dingding.url.value
-        			}
-        		}
-        		if parameter.dingding.url.secretRef != _|_ && parameter.dingding.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					apiVersion: "v1"
-        					kind:       "Secret"
-        					metadata: {
-        						name:      parameter.dingding.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			ding2:       op.#DingTalk & {
-        				message: parameter.dingding.message
-        				dingUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        slack: op.#Steps & {
-        	if parameter.slack != _|_ {
-        		if parameter.slack.url.value != _|_ {
-        			slack1: op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: parameter.slack.url.value
-        			}
-        		}
-        		if parameter.slack.url.secretRef != _|_ && parameter.slack.url.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.slack.url.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			slack2:      op.#Slack & {
-        				message:  parameter.slack.message
-        				slackUrl: stringValue.str
-        			}
-        		}
-        	}
-        }
-        email: op.#Steps & {
-        	if parameter.email != _|_ {
-        		if parameter.email.from.password.value != _|_ {
-        			email1: op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: parameter.email.from.password.value
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-
-        		if parameter.email.from.password.secretRef != _|_ && parameter.email.from.password.value == _|_ {
-        			read: op.#Read & {
-        				value: {
-        					kind:       "Secret"
-        					apiVersion: "v1"
-        					metadata: {
-        						name:      parameter.email.from.password.secretRef.name
-        						namespace: context.namespace
-        					}
-        				}
-        			}
-
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
-        			email2:      op.#SendEmail & {
-        				from: {
-        					address:  parameter.email.from.value
-        					alias:    parameter.email.from.alias
-        					password: stringValue.str
-        					host:     parameter.email.from.host
-        					port:     parameter.email.from.port
-        				}
-        				to:      parameter.email.to
-        				content: parameter.email.content
-        			}
-        		}
-        	}
-        }
-

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

@@ -57,22 +57,21 @@ spec:
         			}
         		} @step(5)
 
-        		decoded:     base64.Decode(null, read.value.data[parameter.url.secretRef.key]) @step(6)
-        		stringValue: op.#ConvertString & {bt:                                          decoded} @step(7)
+        		stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.url.secretRef.key])} @step(6)
         		http:        op.#HTTPPost & {
         			url: stringValue.str
         			request: {
         				body: data.value
         				header: "Content-Type": "application/json"
         			}
-        		} @step(8)
+        		} @step(7)
         	}
         }
         parameter: {
         	// +usage=Specify the webhook url
-        	url: {
+        	url: close({
         		value: string
-        	} | close({
+        	}) | close({
         		secretRef: {
         			// +usage=name is the name of the secret
         			name: string

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

@@ -15,135 +15,114 @@ spec:
         	"strconv"
         )
 
-        mountsArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        mountsArray: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				mountPath: v.mountPath
-        				if v.subPath != _|_ {
-        					subPath: v.subPath
-        				}
-        				name: v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
-        }
-        volumesArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				name: v.name
-        				persistentVolumeClaim: claimName: v.claimName
-        			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
+        ]
+        volumesList: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			name: v.name
+        			persistentVolumeClaim: claimName: v.claimName
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				name: v.name
-        				configMap: {
-        					defaultMode: v.defaultMode
-        					name:        v.cmName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			name: v.name
+        			configMap: {
+        				defaultMode: v.defaultMode
+        				name:        v.cmName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				name: v.name
-        				secret: {
-        					defaultMode: v.defaultMode
-        					secretName:  v.secretName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			name: v.name
+        			secret: {
+        				defaultMode: v.defaultMode
+        				secretName:  v.secretName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				name: v.name
-        				emptyDir: medium: v.medium
-        			}
-        		},
-        	] | []
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			name: v.name
+        			emptyDir: medium: v.medium
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				name: v.name
-        				hostPath: path: v.path
-        			}
-        		},
-        	] | []
-        }
-        volumesList: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			name: v.name
+        			hostPath: 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
+        				_ignore: true
         			}
         			vi
         		},
-        	] if val.ignore == _|_ {
+        	] if val._ignore == _|_ {
         		val
         	},
         ]
@@ -232,7 +211,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
+        						volumeMounts: mountsArray
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -306,6 +285,9 @@ spec:
         		if v.name == _|_ {
         			name: "port-" + strconv.FormatInt(v.port, 10)
         		}
+        		if v.nodePort != _|_ && parameter.exposeType == "NodePort" {
+        			nodePort: v.nodePort
+        		}
         	},
         ]
         outputs: {
@@ -354,6 +336,8 @@ spec:
         		protocol: *"TCP" | "UDP" | "SCTP"
         		// +usage=Specify if the port should be exposed
         		expose: *false | bool
+        		// +usage=exposed node port. Only Valid when exposeType is NodePort
+        		nodePort?: int
         	}]
 
         	// +ignore

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

@@ -13,110 +13,117 @@ spec:
   schematic:
     cue:
       template: |
-        mountsArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        mountsArray: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
-        }
-        volumesArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				name: v.name
-        				persistentVolumeClaim: claimName: v.claimName
-        			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
+        ]
+        volumesList: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			name: v.name
+        			persistentVolumeClaim: claimName: v.claimName
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				name: v.name
-        				configMap: {
-        					defaultMode: v.defaultMode
-        					name:        v.cmName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			name: v.name
+        			configMap: {
+        				defaultMode: v.defaultMode
+        				name:        v.cmName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				name: v.name
-        				secret: {
-        					defaultMode: v.defaultMode
-        					secretName:  v.secretName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			name: v.name
+        			secret: {
+        				defaultMode: v.defaultMode
+        				secretName:  v.secretName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				name: v.name
-        				emptyDir: medium: v.medium
-        			}
-        		},
-        	] | []
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			name: v.name
+        			emptyDir: medium: v.medium
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				name: v.name
-        				hostPath: path: v.path
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			name: v.name
+        			hostPath: 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
+        	},
+        ]
         output: {
         	apiVersion: "apps/v1"
         	kind:       "Deployment"
@@ -169,7 +176,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
+        						volumeMounts: mountsArray
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -221,7 +228,7 @@ spec:
         					}]
         				}
         				if parameter["volumeMounts"] != _|_ {
-        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
+        					volumes: deDupVolumesArray
         				}
         			}
         		}

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

@@ -33,7 +33,7 @@ kind: ClusterRole
 metadata:
   name: {{ include "kubevela.fullname" . }}:manager
 rules:
-  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev"]
+  - apiGroups: ["core.oam.dev", "terraform.core.oam.dev", "prism.oam.dev", "standard.oam.dev"]
     resources: ["*"]
     verbs: ["*"]
   - apiGroups: ["cluster.open-cluster-management.io"]
@@ -221,6 +221,7 @@ spec:
             - "--feature-gates=GzipResourceTracker={{- .Values.featureGates.gzipResourceTracker | toString -}}"
             - "--feature-gates=ZstdResourceTracker={{- .Values.featureGates.zstdResourceTracker | toString -}}"
             - "--feature-gates=ApplyOnce={{- .Values.featureGates.applyOnce | toString -}}"
+            - "--feature-gates=MultiStageComponentApply= {{- .Values.featureGates.multiStageComponentApply | toString -}}"
             {{ if .Values.authentication.enabled }}
             {{ if .Values.authentication.withUser }}
             - "--authentication-with-user"

charts/vela-core/values.yaml

@@ -113,11 +113,13 @@ optimize:
 ##@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.
 featureGates:
   enableLegacyComponentRevision: false
   gzipResourceTracker: false
   zstdResourceTracker: false
   applyOnce: false
+  multiStageComponentApply: false
 
 ## @section MultiCluster parameters
 

charts/vela-minimal/README.md

@@ -56,18 +56,18 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-minimal --
 
 ### KubeVela core parameters
 
-| Name                          | Description                                                                                   | Value                                  |
-| ----------------------------- | --------------------------------------------------------------------------------------------- | -------------------------------------- |
-| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`                                  |
-| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`                                   |
-| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`                                   |
-| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`                                    |
-| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`                                   |
-| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `minimal`                              |
-| `disableCaps`                 | Disable capability                                                                            | `manualscalertrait,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`                                  |
+| Name                          | Description                                                                                   | Value                |
+| ----------------------------- | --------------------------------------------------------------------------------------------- | -------------------- |
+| `systemDefinitionNamespace`   | System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`. | `nil`                |
+| `applicationRevisionLimit`    | Application revision limit                                                                    | `10`                 |
+| `definitionRevisionLimit`     | Definition revision limit                                                                     | `20`                 |
+| `concurrentReconciles`        | concurrentReconciles is the concurrent reconcile number of the controller                     | `4`                  |
+| `controllerArgs.reSyncPeriod` | The period for resync the applications                                                        | `5m`                 |
+| `OAMSpecVer`                  | OAMSpecVer is the oam spec version controller want to setup                                   | `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`                |
 
 
 ### KubeVela workflow parameters

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

@@ -2209,10 +2209,11 @@ spec:
                               execution
                             properties:
                               steps:
-                                description: WorkflowMode describes the mode of workflow
+                                description: Steps is the mode of workflow steps execution
                                 type: string
                               subSteps:
-                                description: WorkflowMode describes the mode of workflow
+                                description: SubSteps is the mode of workflow sub
+                                  steps execution
                                 type: string
                             type: object
                           ref:
@@ -3305,7 +3306,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the policy definition
+                            of the encapsulation of the policy definition. Only CUE
+                            schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3731,7 +3733,8 @@ spec:
                           type: boolean
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the trait
+                            of the encapsulation of the trait. Only CUE and Kube schematic
+                            are supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format
@@ -3885,10 +3888,12 @@ spec:
                               - configuration
                               type: object
                           type: object
-                        skipRevisionAffect:
-                          description: SkipRevisionAffect defines the update this
-                            trait will not generate a new application Revision
-                          type: boolean
+                        stage:
+                          description: Stage defines the stage information to which
+                            this trait resource processing belongs. Currently, PreDispatch
+                            and PostDispatch are provided, which are used to control
+                            resource pre-process and post-process respectively.
+                          type: string
                         status:
                           description: Status defines the custom health policy and
                             status message for trait
@@ -4004,6 +4009,17 @@ spec:
                       namespace:
                         type: string
                     type: object
+                  mode:
+                    description: WorkflowExecuteMode defines the mode of workflow
+                      execution
+                    properties:
+                      steps:
+                        description: Steps is the mode of workflow steps execution
+                        type: string
+                      subSteps:
+                        description: SubSteps is the mode of workflow sub steps execution
+                        type: string
+                    type: object
                   steps:
                     items:
                       description: WorkflowStep defines how to execute a workflow
@@ -4190,7 +4206,8 @@ spec:
                           type: object
                         schematic:
                           description: Schematic defines the data format and template
-                            of the encapsulation of the workflow step definition
+                            of the encapsulation of the workflow step definition.
+                            Only CUE schematic is supported for now.
                           properties:
                             cue:
                               description: CUE defines the encapsulation in CUE format

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

@@ -1020,10 +1020,10 @@ spec:
                       execution
                     properties:
                       steps:
-                        description: WorkflowMode describes the mode of workflow
+                        description: Steps is the mode of workflow steps execution
                         type: string
                       subSteps:
-                        description: WorkflowMode describes the mode of workflow
+                        description: SubSteps is the mode of workflow sub steps execution
                         type: string
                     type: object
                   ref:

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

@@ -445,7 +445,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the policy definition
+                          of the encapsulation of the policy definition. Only CUE
+                          schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -762,7 +763,8 @@ spec:
                         type: boolean
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the trait
+                          of the encapsulation of the trait. Only CUE and Kube schematic
+                          are supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format
@@ -914,10 +916,12 @@ spec:
                             - configuration
                             type: object
                         type: object
-                      skipRevisionAffect:
-                        description: SkipRevisionAffect defines the update this trait
-                          will not generate a new application Revision
-                        type: boolean
+                      stage:
+                        description: Stage defines the stage information to which
+                          this trait resource processing belongs. Currently, PreDispatch
+                          and PostDispatch are provided, which are used to control
+                          resource pre-process and post-process respectively.
+                        type: string
                       status:
                         description: Status defines the custom health policy and status
                           message for trait
@@ -1052,7 +1056,8 @@ spec:
                         type: object
                       schematic:
                         description: Schematic defines the data format and template
-                          of the encapsulation of the workflow step definition
+                          of the encapsulation of the workflow step definition. Only
+                          CUE schematic is supported for now.
                         properties:
                           cue:
                             description: CUE defines the encapsulation in CUE format

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

@@ -60,7 +60,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the policy definition
+                  encapsulation of the policy definition. Only CUE schematic is supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -410,7 +410,8 @@ spec:
                 type: boolean
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the trait
+                  encapsulation of the trait. Only CUE and Kube schematic are supported
+                  for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format
@@ -557,10 +558,12 @@ spec:
                     - configuration
                     type: object
                 type: object
-              skipRevisionAffect:
-                description: SkipRevisionAffect defines the update this trait will
-                  not generate a new application Revision
-                type: boolean
+              stage:
+                description: Stage defines the stage information to which this trait
+                  resource processing belongs. Currently, PreDispatch and PostDispatch
+                  are provided, which are used to control resource pre-process and
+                  post-process respectively.
+                type: string
               status:
                 description: Status defines the custom health policy and status message
                   for trait

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

@@ -57,7 +57,8 @@ spec:
                 type: object
               schematic:
                 description: Schematic defines the data format and template of the
-                  encapsulation of the workflow step definition
+                  encapsulation of the workflow step definition. Only CUE schematic
+                  is supported for now.
                 properties:
                   cue:
                     description: CUE defines the encapsulation in CUE format

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: annotations: {
         		for k, v in parameter {
-        			"\(k)": v
+        			(k): v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: annotations: {
         			for k, v in parameter {
-        				"\(k)": v
+        				(k): v
         			}
         		}
         	}

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

@@ -12,6 +12,8 @@ spec:
     cue:
       template: |
         #ApplyOnceStrategy: {
+        	// +usage=When the strategy takes effect,e.g. onUpdate、onStateKeep
+        	affect?: string
         	// +usage=Specify the path of the resource that allow configuration drift
         	path: [...string]
         }

charts/vela-minimal/templates/defwithtemplate/collect-service-endpoints.yaml

@@ -14,6 +14,7 @@ spec:
         import (
         	"vela/op"
         	"vela/ql"
+        	"strconv"
         )
 
         collect: ql.#CollectServiceEndpoints & {
@@ -34,13 +35,22 @@ spec:
         	}
         } @step(1)
         outputs: {
-        	eps: *[] | [...]
+        	eps_port_name_filtered: *[] | [...]
+        	if parameter.portName == _|_ {
+        		eps_port_name_filtered: collect.list
+        	}
+        	if parameter.portName != _|_ {
+        		eps_port_name_filtered: [ for ep in collect.list if parameter.portName == ep.endpoint.portName {ep}]
+        	}
+
+        	eps_port_filtered: *[] | [...]
         	if parameter.port == _|_ {
-        		eps: collect.list
+        		eps_port_filtered: eps_port_name_filtered
         	}
         	if parameter.port != _|_ {
-        		eps: [ for ep in collect.list if parameter.port == ep.endpoint.port {ep}]
+        		eps_port_filtered: [ for ep in eps_port_name_filtered if parameter.port == ep.endpoint.port {ep}]
         	}
+        	eps:       eps_port_filtered
         	endpoints: *[] | [...]
         	if parameter.outer != _|_ {
         		tmps: [ for ep in eps {
@@ -55,7 +65,7 @@ spec:
         		endpoints: [ for ep in tmps if (!parameter.outer || ep.outer) {ep}]
         	}
         	if parameter.outer == _|_ {
-        		endpoints: eps
+        		endpoints: eps_port_filtered
         	}
         }
         wait: op.#ConditionalWait & {
@@ -63,7 +73,9 @@ spec:
         } @step(2)
         value: {
         	if len(outputs.endpoints) > 0 {
-        		outputs.endpoints[0]
+        		endpoint: outputs.endpoints[0].endpoint
+        		_portStr: strconv.FormatInt(endpoint.port, 10)
+        		url:      "\(parameter.protocal)://\(endpoint.host):\(_portStr)"
         	}
         }
         parameter: {
@@ -75,7 +87,11 @@ spec:
         	components?: [...string]
         	// +usage=Filter the port of the endpoints
         	port?: int
+        	// +usage=Filter the port name of the endpoints
+        	portName?: string
         	// +usage=Filter the endpoint that are only outer
         	outer?: bool
+        	// +usage=The protocal of endpoint url
+        	protocal: *"http" | "https"
         }
 

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

@@ -48,7 +48,7 @@ spec:
         		}
         		_delArgs: {...}
         		if _params.delArgs != null {
-        			_delArgs: {for k in _params.delArgs {"\(k)": ""}}
+        			_delArgs: {for k in _params.delArgs {(k): ""}}
         		}
         		if _params.delArgs == null {
         			_delArgs: {}
@@ -63,7 +63,7 @@ spec:
         		if _params.args == null && _baseContainer.args == _|_ {
         			_args: []
         		}
-        		_argsMap: {for a in _args {"\(a)": ""}}
+        		_argsMap: {for a in _args {(a): ""}}
         		_addArgs: [...string]
         		if _params.addArgs != null {
         			_addArgs: _params.addArgs

charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml

@@ -46,7 +46,7 @@ spec:
         	stringData: {
         		if parameter.auth != _|_ && parameter.auth.username != _|_ {
         			".dockerconfigjson": json.Marshal({
-        				auths: "\(parameter.registry)": {
+        				auths: (parameter.registry): {
         					username: parameter.auth.username
         					password: parameter.auth.password
         					if parameter.auth.email != _|_ {

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

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

charts/vela-minimal/templates/defwithtemplate/create-config.yaml

@@ -0,0 +1,44 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/create-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Create or update a config
+  name: create-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        deploy: op.#CreateConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        	if parameter.template != _|_ {
+        		template: parameter.template
+        	}
+        	config: parameter.config
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+
+        	//+usage=Specify the template of the config.
+        	template?: string
+
+        	//+usage=Specify the content of the config.
+        	config: {...}
+        }
+

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

@@ -15,116 +15,117 @@ spec:
         	"strconv"
         )
 
-        mountsArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        mountsArray: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				mountPath: v.mountPath
-        				name:      v.name
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
         			}
-        		},
-        	] | []
+        			name: v.name
+        		}
+        	},
 
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				mountPath: v.mountPath
-        				if v.mountPropagation != _|_ {
-        					mountPropagation: v.mountPropagation
-        				}
-        				name: v.name
-        				if v.readOnly != _|_ {
-        					readOnly: v.readOnly
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			mountPath: v.mountPath
+        			if v.subPath != _|_ {
+        				subPath: v.subPath
+        			}
+        			name: v.name
+        		}
+        	},
+        ]
+        volumesList: [
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
+        		{
+        			name: v.name
+        			persistentVolumeClaim: claimName: v.claimName
+        		}
+        	},
+
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
+        		{
+        			name: v.name
+        			configMap: {
+        				defaultMode: v.defaultMode
+        				name:        v.cmName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
-        }
-        volumesArray: {
-        	pvc: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.pvc != _|_ for v in parameter.volumeMounts.pvc {
-        			{
-        				name: v.name
-        				persistentVolumeClaim: claimName: v.claimName
-        			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	configMap: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.configMap != _|_ for v in parameter.volumeMounts.configMap {
-        			{
-        				name: v.name
-        				configMap: {
-        					defaultMode: v.defaultMode
-        					name:        v.cmName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
+        		{
+        			name: v.name
+        			secret: {
+        				defaultMode: v.defaultMode
+        				secretName:  v.secretName
+        				if v.items != _|_ {
+        					items: v.items
         				}
         			}
-        		},
-        	] | []
+        		}
+        	},
 
-        	secret: *[
-        		if parameter.volumeMounts != _|_ && parameter.volumeMounts.secret != _|_ for v in parameter.volumeMounts.secret {
-        			{
-        				name: v.name
-        				secret: {
-        					defaultMode: v.defaultMode
-        					secretName:  v.secretName
-        					if v.items != _|_ {
-        						items: v.items
-        					}
-        				}
-        			}
-        		},
-        	] | []
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
+        		{
+        			name: v.name
+        			emptyDir: medium: v.medium
+        		}
+        	},
 
-        	emptyDir: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.emptyDir != _|_ for v in parameter.volumeMounts.emptyDir {
-        			{
-        				name: v.name
-        				emptyDir: medium: v.medium
+        	if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
+        		{
+        			name: v.name
+        			hostPath: 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
         		},
-        	] | []
-
-        	hostPath: *[
-        			if parameter.volumeMounts != _|_ && parameter.volumeMounts.hostPath != _|_ for v in parameter.volumeMounts.hostPath {
-        			{
-        				name: v.name
-        				hostPath: path: v.path
-        			}
-        		},
-        	] | []
-        }
+        	] if val._ignore == _|_ {
+        		val
+        	},
+        ]
         output: {
         	apiVersion: "apps/v1"
         	kind:       "DaemonSet"
@@ -210,7 +211,7 @@ spec:
         					}
 
         					if parameter["volumeMounts"] != _|_ {
-        						volumeMounts: mountsArray.pvc + mountsArray.configMap + mountsArray.secret + mountsArray.emptyDir + mountsArray.hostPath
+        						volumeMounts: mountsArray
         					}
 
         					if parameter["livenessProbe"] != _|_ {
@@ -268,7 +269,7 @@ spec:
         				}
 
         				if parameter["volumeMounts"] != _|_ {
-        					volumes: volumesArray.pvc + volumesArray.configMap + volumesArray.secret + volumesArray.emptyDir + volumesArray.hostPath
+        					volumes: deDupVolumesArray
         				}
         			}
         		}

charts/vela-minimal/templates/defwithtemplate/delete-config.yaml

@@ -0,0 +1,34 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/delete-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Delete a config
+  name: delete-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        deploy: op.#DeleteConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

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

@@ -19,11 +19,11 @@ spec:
         )
 
         app: op.#Steps & {
-        	load: op.#Load @step(1)
+        	load: op.#Load
         	clusters: [...string]
-        	listClusters: op.#ListClusters @step(2)
         	if parameter.clusters == _|_ {
-        		clusters: listClusters.outputs.clusters
+        		listClusters: op.#ListClusters
+        		clusters:     listClusters.outputs.clusters
         	}
         	if parameter.clusters != _|_ {
         		clusters: parameter.clusters
@@ -38,7 +38,7 @@ spec:
         				}
         			}
         		}
-        	} @step(3)
+        	}
         }
         parameter: {
         	// +usage=Declare the runtime clusters to apply, if empty, all runtime clusters will be used

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

@@ -29,7 +29,7 @@ spec:
         PatchContainer: {
         	_params: #PatchParams
         	name:    _params.containerName
-        	_delKeys: {for k in _params.unset {"\(k)": ""}}
+        	_delKeys: {for k in _params.unset {(k): ""}}
         	_baseContainers: context.output.spec.template.spec.containers
         	_matchContainers_: [ for _container_ in _baseContainers if _container_.name == name {_container_}]
         	_baseContainer: *_|_ | {...}
@@ -47,7 +47,7 @@ spec:
         			}]
         		}
         		if _baseEnv != _|_ {
-        			_baseEnvMap: {for envVar in _baseEnv {"\(envVar.name)": envVar}}
+        			_baseEnvMap: {for envVar in _baseEnv {(envVar.name): envVar}}
         			// +patchStrategy=replace
         			env: [ for envVar in _baseEnv if _delKeys[envVar.name] == _|_ && !_params.replace {
         				name: envVar.name

charts/vela-minimal/templates/defwithtemplate/export-data.yaml

@@ -43,7 +43,7 @@ spec:
         }      @step(2)
         apply: op.#Steps & {
         	for p in getPlacements.placements {
-        		"\(p.cluster)": op.#Apply & {
+        		(p.cluster): op.#Apply & {
         			value:   object
         			cluster: p.cluster
         		}

charts/vela-minimal/templates/defwithtemplate/export-service.yaml

@@ -0,0 +1,79 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export-service.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export service to clusters specified by topology.
+  name: export-service
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        meta: {
+        	name:      *context.name | string
+        	namespace: *context.namespace | string
+        	if parameter.name != _|_ {
+        		name: parameter.name
+        	}
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        }
+        objects: [{
+        	apiVersion: "v1"
+        	kind:       "Service"
+        	metadata:   meta
+        	spec: {
+        		type: "ClusterIP"
+        		ports: [{
+        			protocol:   "TCP"
+        			port:       parameter.port
+        			targetPort: parameter.targetPort
+        		}]
+        	}
+        }, {
+        	apiVersion: "v1"
+        	kind:       "Endpoints"
+        	metadata:   meta
+        	subsets: [{
+        		addresses: [{ip: parameter.ip}]
+        		ports: [{port: parameter.targetPort}]
+        	}]
+        }] @step(1)
+        getPlacements: op.#GetPlacementsFromTopologyPolicies & {
+        	policies: *[] | [...string]
+        	if parameter.topology != _|_ {
+        		policies: [parameter.topology]
+        	}
+        }      @step(2)
+        apply: op.#Steps & {
+        	for p in getPlacements.placements {
+        		for o in objects {
+        			"\(p.cluster)-\(o.kind)": op.#Apply & {
+        				value:   o
+        				cluster: p.cluster
+        			}
+        		}
+        	}
+        } @step(3)
+        parameter: {
+        	// +usage=Specify the name of the export destination
+        	name?: string
+        	// +usage=Specify the namespace of the export destination
+        	namespace?: string
+        	// +usage=Specify the ip to be export
+        	ip: string
+        	// +usage=Specify the port to be used in service
+        	port: int
+        	// +usage=Specify the port to be export
+        	targetPort: int
+        	// +usage=Specify the topology to export
+        	topology?: string
+        }
+

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

@@ -30,9 +30,15 @@ spec:
         		]
         	}
         }
+        legacyAPI: context.clusterVersion.minor < 19
         outputs: ingress: {
-        	apiVersion: "networking.k8s.io/v1"
-        	kind:       "Ingress"
+        	if legacyAPI {
+        		apiVersion: "networking.k8s.io/v1beta1"
+        	}
+        	if !legacyAPI {
+        		apiVersion: "networking.k8s.io/v1"
+        	}
+        	kind: "Ingress"
         	metadata: {
         		name: context.name
         		annotations: {
@@ -64,9 +70,17 @@ spec:
         				for k, v in parameter.http {
         					path:     k
         					pathType: "ImplementationSpecific"
-        					backend: service: {
-        						name: context.name
-        						port: number: v
+        					backend: {
+        						if legacyAPI {
+        							serviceName: context.name
+        							servicePort: v
+        						}
+        						if !legacyAPI {
+        							service: {
+        								name: context.name
+        								port: number: v
+        							}
+        						}
         					}
         				},
         			]
@@ -104,7 +118,7 @@ spec:
       	    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
         	}
         	if igs[0].host == _|_ {
-      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster"
+      	    message: "Host not specified, visit the cluster or load balancer in front of the cluster with IP: " + igs[0].ip
         	}
         }
         if igs[0].ip == _|_ {

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

@@ -28,8 +28,9 @@ spec:
         		}]
         	}]
         	initContainers: [{
-        		name:  parameter.name
-        		image: parameter.image
+        		name:            parameter.name
+        		image:           parameter.image
+        		imagePullPolicy: parameter.imagePullPolicy
         		if parameter.cmd != _|_ {
         			command: parameter.cmd
         		}
@@ -59,6 +60,9 @@ spec:
         	// +usage=Specify the image of init container
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy: *"IfNotPresent" | "Always" | "Never"
+
         	// +usage=Specify the commands run in the init container
         	cmd?: [...string]
 

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

@@ -18,13 +18,13 @@ spec:
         patch: {
         	metadata: labels: {
         		for k, v in parameter {
-        			"\(k)": v
+        			(k): v
         		}
         	}
         	if context.output.spec != _|_ && context.output.spec.template != _|_ {
         		spec: template: metadata: labels: {
         			for k, v in parameter {
-        				"\(k)": v
+        				(k): v
         			}
         		}
         	}

charts/vela-minimal/templates/defwithtemplate/list-config.yaml

@@ -0,0 +1,33 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/list-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: List the configs
+  name: list-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ListConfig & {
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        	template: parameter.template
+        }
+        parameter: {
+        	//+usage=Specify the template of the config.
+        	template: string
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

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

@@ -108,7 +108,7 @@ spec:
         						portForward: parameter.portForward
         					}
         					if parameter.portForward == _|_ {
-        						portForward: ["\(parameter.port)" + ":" + "\(parameter.port)"]
+        						portForward: ["\(parameter.port):\(parameter.port)"]
         					}
         				}
         			},

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

@@ -20,10 +20,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send Lark messages
         	lark?: {
         		// +usage=Specify the the lark url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -42,10 +42,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send DingTalk messages
         	dingding?: {
         		// +usage=Specify the the dingding url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -100,10 +100,10 @@ spec:
         	// +usage=Please fulfill its url and message if you want to send Slack messages
         	slack?: {
         		// +usage=Specify the the slack url, you can either sepcify it in value or use secretRef
-        		url: {
+        		url: close({
         			// +usage=the url address content in string
         			value: string
-        		} | close({
+        		}) | close({
         			secretRef: {
         				// +usage=name is the name of the secret
         				name: string
@@ -134,10 +134,10 @@ spec:
         			// +usage=The alias is the email alias to show after sending the email
         			alias?: string
         			// +usage=Specify the password of the email, you can either sepcify it in value or use secretRef
-        			password: {
+        			password: close({
         				// +usage=the password content in string
         				value: string
-        			} | close({
+        			}) | close({
         				secretRef: {
         					// +usage=name is the name of the secret
         					name: string
@@ -201,20 +201,10 @@ spec:
         	verbatim?: bool
         }
         option: {
-        	text: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	value: string
-        	description?: {
-        		type:      string
-        		text:      string
-        		emoji?:    bool
-        		verbatim?: bool
-        	}
-        	url?: string
+        	text:         textType
+        	value:        string
+        	description?: textType
+        	url?:         string
         }
         // send webhook notification
         ding: op.#Steps & {
@@ -237,8 +227,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.dingding.url.secretRef.key])}
         			ding2:       op.#DingTalk & {
         				message: parameter.dingding.message
         				dingUrl: stringValue.str
@@ -266,8 +255,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.lark.url.secretRef.key])}
         			lark2:       op.#Lark & {
         				message: parameter.lark.message
         				larkUrl: stringValue.str
@@ -295,8 +283,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.slack.url.secretRef.key])}
         			slack2:      op.#Slack & {
         				message:  parameter.slack.message
         				slackUrl: stringValue.str
@@ -334,8 +321,7 @@ spec:
         				}
         			}
 
-        			decoded:     base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])
-        			stringValue: op.#ConvertString & {bt: decoded}
+        			stringValue: op.#ConvertString & {bt: base64.Decode(null, read.value.data[parameter.email.from.password.secretRef.key])}
         			email2:      op.#SendEmail & {
         				from: {
         					address: parameter.email.from.address

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

@@ -0,0 +1,24 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/print-message-in-status.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: pring message in workflow status
+  labels:
+    custom.definition.oam.dev/ui-hidden: "true"
+  name: print-message-in-status
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        parameter: message: string
+        msg: op.#Message & {
+        	message: parameter.message
+        }
+

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

@@ -0,0 +1,34 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/read-config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Read a config
+  name: read-config
+  namespace: {{ include "systemDefinitionNamespace" . }}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: op.#ReadConfig & {
+        	name: parameter.name
+        	if parameter.namespace != _|_ {
+        		namespace: parameter.namespace
+        	}
+        	if parameter.namespace == _|_ {
+        		namespace: context.namespace
+        	}
+        }
+        parameter: {
+        	//+usage=Specify the name of the config.
+        	name: string
+
+        	//+usage=Specify the namespace of the config.
+        	namespace?: string
+        }
+

charts/vela-minimal/templates/defwithtemplate/service-account.yaml

@@ -85,7 +85,7 @@ spec:
         				subjects: [{
         					kind:      "ServiceAccount"
         					name:      parameter.name
-        					namespace: "\(context.namespace)"
+        					namespace: (context.namespace)
         				}]
         			}
         		}

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

@@ -17,16 +17,14 @@ spec:
   schematic:
     cue:
       template: |
-        pvcVolumesList: *[
-        		if parameter.pvc != _|_ for v in parameter.pvc {
+        volumesList: [
+        	if parameter.pvc != _|_ for v in parameter.pvc {
         		{
         			name: "pvc-" + v.name
         			persistentVolumeClaim: claimName: v.name
         		}
         	},
-        ] | []
-        configMapVolumesList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name: "configmap-" + v.name
         			configMap: {
@@ -38,9 +36,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        secretVolumesList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name: "secret-" + v.name
         			secret: {
@@ -52,17 +48,15 @@ spec:
         			}
         		}
         	},
-        ] | []
-        emptyDirVolumesList: *[
-        			if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
         		{
         			name: "emptydir-" + v.name
         			emptyDir: medium: v.medium
         		}
         	},
-        ] | []
-        pvcVolumeMountsList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc {
+        ]
+        volumeMountsList: [
+        	if parameter.pvc != _|_ for v in parameter.pvc {
         		if v.volumeMode == "Filesystem" {
         			{
         				name:      "pvc-" + v.name
@@ -73,9 +67,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        configMapVolumeMountsList: *[
-        				if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountPath != _|_ {
         		{
         			name:      "configmap-" + v.name
         			mountPath: v.mountPath
@@ -84,31 +76,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        configMapEnvMountsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
-        		{
-        			name: v.mountToEnv.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  v.mountToEnv.configMapKey
-        			}
-        		}
-        	},
-        ] | []
-        configMountToEnvsList: *[
-        			if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: configMapKeyRef: {
-        				name: v.name
-        				key:  k.configMapKey
-        			}
-        		}
-        	},
-        ] | []
-        secretVolumeMountsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountPath != _|_ {
         		{
         			name:      "secret-" + v.name
         			mountPath: v.mountPath
@@ -117,31 +85,7 @@ spec:
         			}
         		}
         	},
-        ] | []
-        secretEnvMountsList: *[
-        			if parameter.secret != _|_ if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
-        		{
-        			name: v.mountToEnv.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  v.mountToEnv.secretKey
-        			}
-        		}
-        	},
-        ] | []
-        secretMountToEnvsList: *[
-        			if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
-        		{
-        			name: k.envName
-        			valueFrom: secretKeyRef: {
-        				name: v.name
-        				key:  k.secretKey
-        			}
-        		}
-        	},
-        ] | []
-        emptyDirVolumeMountsList: *[
-        				if parameter.emptyDir != _|_ for v in parameter.emptyDir {
+        	if parameter.emptyDir != _|_ for v in parameter.emptyDir {
         		{
         			name:      "emptydir-" + v.name
         			mountPath: v.mountPath
@@ -150,9 +94,47 @@ spec:
         			}
         		}
         	},
-        ] | []
+        ]
+        envList: [
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnv != _|_ {
+        		{
+        			name: v.mountToEnv.envName
+        			valueFrom: configMapKeyRef: {
+        				name: v.name
+        				key:  v.mountToEnv.configMapKey
+        			}
+        		}
+        	},
+        	if parameter.configMap != _|_ for v in parameter.configMap if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        		{
+        			name: k.envName
+        			valueFrom: configMapKeyRef: {
+        				name: v.name
+        				key:  k.configMapKey
+        			}
+        		}
+        	},
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnv != _|_ {
+        		{
+        			name: v.mountToEnv.envName
+        			valueFrom: secretKeyRef: {
+        				name: v.name
+        				key:  v.mountToEnv.secretKey
+        			}
+        		}
+        	},
+        	if parameter.secret != _|_ for v in parameter.secret if v.mountToEnvs != _|_ for k in v.mountToEnvs {
+        		{
+        			name: k.envName
+        			valueFrom: secretKeyRef: {
+        				name: v.name
+        				key:  k.secretKey
+        			}
+        		}
+        	},
+        ]
         volumeDevicesList: *[
-        			if parameter.pvc != _|_ for v in parameter.pvc if v.volumeMode == "Block" {
+        			for v in parameter.pvc if v.volumeMode == "Block" {
         		{
         			name:       "pvc-" + v.name
         			devicePath: v.mountPath
@@ -162,7 +144,6 @@ spec:
         		}
         	},
         ] | []
-        volumesList: pvcVolumesList + configMapVolumesList + secretVolumesList + emptyDirVolumesList
         deDupVolumesArray: [
         	for val in [
         		for i, vi in volumesList {
@@ -181,16 +162,16 @@ spec:
 
         	containers: [{
         		// +patchKey=name
-        		env: configMapEnvMountsList + secretEnvMountsList + configMountToEnvsList + secretMountToEnvsList
+        		env: envList
         		// +patchKey=name
         		volumeDevices: volumeDevicesList
         		// +patchKey=name
-        		volumeMounts: pvcVolumeMountsList + configMapVolumeMountsList + secretVolumeMountsList + emptyDirVolumeMountsList
+        		volumeMounts: volumeMountsList
         	}, ...]
 
         }
         outputs: {
-        	if parameter.pvc != _|_ for v in parameter.pvc {
+        	for v in parameter.pvc {
         		if v.mountOnly == false {
         			"pvc-\(v.name)": {
         				apiVersion: "v1"
@@ -229,7 +210,7 @@ spec:
         		}
         	}
 
-        	if parameter.configMap != _|_ for v in parameter.configMap {
+        	for v in parameter.configMap {
         		if v.mountOnly == false {
         			"configmap-\(v.name)": {
         				apiVersion: "v1"
@@ -242,7 +223,7 @@ spec:
         		}
         	}
 
-        	if parameter.secret != _|_ for v in parameter.secret {
+        	for v in parameter.secret {
         		if v.mountOnly == false {
         			"secret-\(v.name)": {
         				apiVersion: "v1"

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

@@ -63,7 +63,7 @@ spec:
         					}
 
         					if parameter["volumes"] != _|_ {
-        						volumeMounts: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        						volumeMounts: [ for v in parameter.volumes {
         							{
         								mountPath: v.mountPath
         								name:      v.name
@@ -72,7 +72,7 @@ spec:
         				}]
 
         				if parameter["volumes"] != _|_ {
-        					volumes: [ if parameter.volumes != _|_ for v in parameter.volumes {
+        					volumes: [ for v in parameter.volumes {
         						{
         							name: v.name
         							if v.type == "pvc" {
@@ -103,7 +103,7 @@ spec:
         				}
 
         				if parameter["imagePullSecrets"] != _|_ {
-        					imagePullSecrets: [ if parameter.imagePullSecrets != _|_ for v in parameter.imagePullSecrets {
+        					imagePullSecrets: [ for v in parameter.imagePullSecrets {
         						name: v
         					},
         					]