Feat: add helm type component definition custom status (#2525)

(cherry picked from commit d8c33db293)

Co-authored-by: qiaozp <chivalry.pp@gmail.com>

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

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
@@ -115,10 +116,17 @@ func (app *Application) ConvertFrom(src conversion.Hub) error {
 			}
 			// convert component
 			//  `.properties` -> `.settings`
+
+			var compProperties runtime.RawExtension
+
+			if comp.Properties != nil {
+				compProperties = *comp.Properties.DeepCopy()
+			}
+
 			app.Spec.Components = append(app.Spec.Components, ApplicationComponent{
 				Name:         comp.Name,
 				WorkloadType: comp.Type,
-				Settings:     *comp.Properties.DeepCopy(),
+				Settings:     compProperties,
 				Traits:       traits,
 				Scopes:       scopes,
 			})

apis/types/types.go

@@ -85,4 +85,5 @@ var DefaultFilterAnnots = []string{
 	oam.AnnotationInplaceUpgrade,
 	oam.AnnotationFilterLabelKeys,
 	oam.AnnotationFilterAnnotationKeys,
+	oam.AnnotationLastAppliedConfiguration,
 }

charts/oam-runtime/values.yaml

@@ -68,8 +68,8 @@ admissionWebhooks:
   patch:
     enabled: true
     image:
-      repository: wonderflow/kube-webhook-certgen
-      tag: v2.1
+      repository: oamdev/kube-webhook-certgen
+      tag: v2.3
       pullPolicy: IfNotPresent
     affinity: {}
     tolerations: []

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

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

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

@@ -1,39 +1,38 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
       name: keda
       namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: keda
-            properties:
-              chart: keda
-              repoType: helm
-              url: https://kedacore.github.io/charts
-            type: helm
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
-          apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
+      components:
+      - name: keda
+        properties:
+          chart: keda
+          repoType: helm
+          url: https://kedacore.github.io/charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
@@ -10,182 +10,173 @@ data:
       name: kruise
       namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: kruise
-            properties:
-              chart: ./charts/kruise/v0.9.0
-              git:
-                branch: master
-              repoType: git
-              url: https://github.com/openkruise/kruise
-              values:
-                featureGates: PreDownloadImageForInPlaceUpdate=true
-            type: helm
-          - name: cloneset
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Describes long-running, scalable, containerized
-                    services that have a stable network endpoint to receive external network
-                    traffic from customers. If workload type is skipped for any service
-                    defined in Appfile, it will be defaulted to `webservice` type.
-                name: cloneset
-                namespace: vela-system
-              spec:
-                schematic:
-                  cue:
-                    template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
-                      \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
-                      context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
-                      context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels:
-                      {\n\t\t\t\t\"app.oam.dev/component\": context.name\n\t\t\t}\n\n\t\t\tspec:
-                      {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:  context.name\n\t\t\t\t\timage:
-                      parameter.image\n\n\t\t\t\t\tif parameter.cmd != _|_ {\n\t\t\t\t\t\tcommand:
-                      parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.args != _|_ {\n\t\t\t\t\t\targs:
-                      parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.env != _|_ {\n\t\t\t\t\t\tenv:
-                      parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif context.config != _|_
-                      {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                      parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
-                      parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
-                      parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"]
-                      != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
-                      cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
-                      != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:
-                      \  parameter.memory\n\t\t\t\t\t\t\trequests: memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                      parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe:
-                      parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"readinessProbe\"]
-                      != _|_ {\n\t\t\t\t\t\treadinessProbe: parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle:
-                      {\n\t\t\t\t\t\tif parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart:
-                      exec: command: parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif
-                      parameter.preStop != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command:
-                      parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
-                      parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
-                      parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
-                      [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
-                      parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
-                      parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter:
-                      {\n\t// +usage=Which image would you like to use for your service\n\t//
-                      +short=i\n\timage: string\n\n\t// +usage=Specify image pull policy
-                      for your service\n\timagePullPolicy?: string\n\n\t// +usage=Specify
-                      image pull secrets for your service\n\timagePullSecrets?: [...string]\n\n\t//
-                      +usage=Number of CPU units for the service, like `0.5` (0.5 CPU
-                      core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify the
-                      amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
-                      +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
-                      +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
-                      commands will be called immediately after a container is created.\n\tpostStart?:
-                      [...string]\n\n\t// +usage=PreStop is called immediately before
-                      a container is terminated due to an API request or management event
-                      such as liveness/startup probe failure, preemption, resource contention,
-                      etc. The handler is not called if the container crashes or exits.
-                      The reason for termination is passed to the handler. The Pod's termination
-                      grace period countdown begins before the PreStop hooked is executed.
-                      Regardless of the outcome of the handler, the container will eventually
-                      terminate within the Pod's termination grace period. Other management
-                      of the container blocks until the hook completes or until the termination
-                      grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
-                      [...string]\n\n\t// +usage=Which port do you want customer traffic
-                      sent to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define
-                      arguments by using environment variables\n\tenv?: [...#ENV]\n\n\t//
-                      +usage=Cloneset updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
-                      string\n\n\t// +usage=HostAliases is a list of hosts and IPs that
-                      will be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
-                      [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for
-                      assessing whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
-                      +usage=Instructions for assessing whether the container is in a
-                      suitable state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
-                      {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
-                      value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
-                      a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
-                      +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
-                      {\n\t\t\t// +usage=The name of the secret in the pod's namespace
-                      to select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the
-                      secret to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
-                      {\n\n\t// +usage=Instructions for assessing container health by
-                      executing a command. Either this attribute or the httpGet attribute
-                      or the tcpSocket attribute MUST be specified. This attribute is
-                      mutually exclusive with both the httpGet attribute and the tcpSocket
-                      attribute.\n\texec?: {\n\t\t// +usage=A command to be executed inside
-                      the container to assess its health. Each space delimited token of
-                      the command is a separate array element. Commands exiting 0 are
-                      considered to be successful probes, whilst all other exit codes
-                      are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
-                      +usage=Instructions for assessing container health by executing
-                      an HTTP GET request. Either this attribute or the exec attribute
-                      or the tcpSocket attribute MUST be specified. This attribute is
-                      mutually exclusive with both the exec attribute and the tcpSocket
-                      attribute.\n\thttpGet?: {\n\t\t// +usage=The endpoint, relative
-                      to the port, to which the HTTP GET request should be directed.\n\t\tpath:
-                      string\n\t\t// +usage=The TCP socket within the container to which
-                      the HTTP GET request should be directed.\n\t\tport: int\n\t\thttpHeaders?:
-                      [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
-                      +usage=Instructions for assessing container health by probing a
-                      TCP socket. Either this attribute or the exec attribute or the httpGet
-                      attribute MUST be specified. This attribute is mutually exclusive
-                      with both the exec attribute and the httpGet attribute.\n\ttcpSocket?:
-                      {\n\t\t// +usage=The TCP socket within the container that should
-                      be probed to assess container health.\n\t\tport: int\n\t}\n\n\t//
-                      +usage=Number of seconds after the container is started before the
-                      first probe is initiated.\n\tinitialDelaySeconds: *0 | int\n\n\t//
-                      +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
-                      *10 | int\n\n\t// +usage=Number of seconds after which the probe
-                      times out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
-                      successes for the probe to be considered successful after having
-                      failed.\n\tsuccessThreshold: *1 | int\n\n\t// +usage=Number of consecutive
-                      failures required to determine the container is not alive (liveness
-                      probe) or not ready (readiness probe).\n\tfailureThreshold: *3 |
-                      int\n} \n"
-                workload:
-                  definition:
-                    apiVersion: apps.kruise.io/v1alpha1
-                    kind: CloneSet
-            type: raw
-          - name: predownloadimage
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: WorkflowStepDefinition
-              metadata:
-                name: predownloadimage
-              spec:
-                schematic:
-                  cue:
-                    template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
-                      int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
-                      *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
-                      int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
-                      op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
-                      \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
-                      \   }\n    spec: {\n      image: parameter.image\n      parallelism:
-                      parameter.parallel\n      selector: matchLabels: parameter.kvs\n
-                      \     completionPolicy: {\n        type: parameter.type\n        activeDeadlineSeconds:
-                      parameter.activeDeadlineSeconds\n        ttlSecondsAfterFinished:
-                      parameter.ttlSecondsAfterFinished\n      }\n      pullPolicy: {\n
-                      \       if parameter.backoffLimit != _|_ {\n          backoffLimit:
-                      parameter.backoffLimit\n        }\n        if parameter.timeoutSeconds
-                      != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n        }\n
-                      \     }\n      pullSecrets: parameter.arr\n    }            \n  }
-                      \         \n} \n"
-            type: raw
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
+      components:
+      - name: kruise
+        properties:
+          chart: ./charts/kruise/v0.9.0
+          git:
+            branch: master
+          repoType: git
+          url: https://github.com/openkruise/kruise
+          values:
+            featureGates: PreDownloadImageForInPlaceUpdate=true
+        type: helm
+      - name: cloneset
+        properties:
           apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Describes long-running, scalable, containerized
+                services that have a stable network endpoint to receive external network
+                traffic from customers. If workload type is skipped for any service defined
+                in Appfile, it will be defaulted to `webservice` type.
+            name: cloneset
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
+                  \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
+                  context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
+                  context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels: {\n\t\t\t\t\"app.oam.dev/component\":
+                  context.name\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:
+                  \ context.name\n\t\t\t\t\timage: parameter.image\n\n\t\t\t\t\tif parameter.cmd
+                  != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif
+                  parameter.args != _|_ {\n\t\t\t\t\t\targs: parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif
+                  parameter.env != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  context.config != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
+                  parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
+                  parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"] != _|_
+                  {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
+                  cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
+                  != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:   parameter.memory\n\t\t\t\t\t\t\trequests:
+                  memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+                  parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
+                  parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle: {\n\t\t\t\t\t\tif
+                  parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart: exec: command:
+                  parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif parameter.preStop
+                  != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command: parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
+                  parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
+                  parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+                  [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
+                  parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
+                  parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter: {\n\t//
+                  +usage=Which image would you like to use for your service\n\t// +short=i\n\timage:
+                  string\n\n\t// +usage=Specify image pull policy for your service\n\timagePullPolicy?:
+                  string\n\n\t// +usage=Specify image pull secrets for your service\n\timagePullSecrets?:
+                  [...string]\n\n\t// +usage=Number of CPU units for the service, like
+                  `0.5` (0.5 CPU core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify
+                  the amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
+                  +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
+                  +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
+                  commands will be called immediately after a container is created.\n\tpostStart?:
+                  [...string]\n\n\t// +usage=PreStop is called immediately before a container
+                  is terminated due to an API request or management event such as liveness/startup
+                  probe failure, preemption, resource contention, etc. The handler is
+                  not called if the container crashes or exits. The reason for termination
+                  is passed to the handler. The Pod's termination grace period countdown
+                  begins before the PreStop hooked is executed. Regardless of the outcome
+                  of the handler, the container will eventually terminate within the Pod's
+                  termination grace period. Other management of the container blocks until
+                  the hook completes or until the termination grace period is reached.
+                  More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
+                  [...string]\n\n\t// +usage=Which port do you want customer traffic sent
+                  to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define arguments
+                  by using environment variables\n\tenv?: [...#ENV]\n\n\t// +usage=Cloneset
+                  updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
+                  string\n\n\t// +usage=HostAliases is a list of hosts and IPs that will
+                  be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
+                  [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for assessing
+                  whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
+                  +usage=Instructions for assessing whether the container is in a suitable
+                  state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
+                  {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
+                  value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
+                  a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
+                  +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
+                  {\n\t\t\t// +usage=The name of the secret in the pod's namespace to
+                  select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the secret
+                  to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
+                  {\n\n\t// +usage=Instructions for assessing container health by executing
+                  a command. Either this attribute or the httpGet attribute or the tcpSocket
+                  attribute MUST be specified. This attribute is mutually exclusive with
+                  both the httpGet attribute and the tcpSocket attribute.\n\texec?: {\n\t\t//
+                  +usage=A command to be executed inside the container to assess its health.
+                  Each space delimited token of the command is a separate array element.
+                  Commands exiting 0 are considered to be successful probes, whilst all
+                  other exit codes are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
+                  +usage=Instructions for assessing container health by executing an HTTP
+                  GET request. Either this attribute or the exec attribute or the tcpSocket
+                  attribute MUST be specified. This attribute is mutually exclusive with
+                  both the exec attribute and the tcpSocket attribute.\n\thttpGet?: {\n\t\t//
+                  +usage=The endpoint, relative to the port, to which the HTTP GET request
+                  should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
+                  within the container to which the HTTP GET request should be directed.\n\t\tport:
+                  int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
+                  +usage=Instructions for assessing container health by probing a TCP
+                  socket. Either this attribute or the exec attribute or the httpGet attribute
+                  MUST be specified. This attribute is mutually exclusive with both the
+                  exec attribute and the httpGet attribute.\n\ttcpSocket?: {\n\t\t// +usage=The
+                  TCP socket within the container that should be probed to assess container
+                  health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
+                  container is started before the first probe is initiated.\n\tinitialDelaySeconds:
+                  *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
+                  *10 | int\n\n\t// +usage=Number of seconds after which the probe times
+                  out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
+                  successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
+                  *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
+                  the container is not alive (liveness probe) or not ready (readiness
+                  probe).\n\tfailureThreshold: *3 | int\n} \n"
+            workload:
+              definition:
+                apiVersion: apps.kruise.io/v1alpha1
+                kind: CloneSet
+        type: raw
+      - name: predownloadimage
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: WorkflowStepDefinition
+          metadata:
+            name: predownloadimage
+          spec:
+            schematic:
+              cue:
+                template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
+                  int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
+                  *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
+                  int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
+                  op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
+                  \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
+                  \   }\n    spec: {\n      image: parameter.image\n      parallelism:
+                  parameter.parallel\n      selector: matchLabels: parameter.kvs\n      completionPolicy:
+                  {\n        type: parameter.type\n        activeDeadlineSeconds: parameter.activeDeadlineSeconds\n
+                  \       ttlSecondsAfterFinished: parameter.ttlSecondsAfterFinished\n
+                  \     }\n      pullPolicy: {\n        if parameter.backoffLimit != _|_
+                  {\n          backoffLimit: parameter.backoffLimit\n        }\n        if
+                  parameter.timeoutSeconds != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n
+                  \       }\n      }\n      pullSecrets: parameter.arr\n    }            \n
+                  \ }          \n} \n"
+        type: raw
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

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

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

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

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

@@ -1,128 +0,0 @@
-apiVersion: v1
-data:
-  initializer: |
-    apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
-    metadata:
-      annotations:
-        addons.oam.dev/description: Preparations that observability need
-      name: observability-asset
-      namespace: vela-system
-    spec:
-      appTemplate:
-        spec:
-          components:
-          - name: observability
-            properties:
-              apiVersion: v1
-              kind: Namespace
-              metadata:
-                name: observability
-            type: raw
-          - name: import-grafana-dashboard
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: TraitDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Import dashboards to Grafana
-                name: import-grafana-dashboard
-                namespace: vela-system
-              spec:
-                schematic:
-                  cue:
-                    template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                      \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                      \                  parameter.grafanaServiceName\n\t\t\tnamespace:
-                      \                parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                      \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                      parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
-                      {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:
-                      \  *\"default\" | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
-                      *\"default\" | string\n\turls: [...string]\n} \n"
-            type: raw
-          - name: pure-ingress
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: TraitDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Enable public web traffic for the component
-                    without creating a Service.
-                name: pure-ingress
-                namespace: vela-system
-              spec:
-                schematic:
-                  cue:
-                    template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
-                      \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec:
-                      {\n\t\trules: [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths:
-                      [\n\t\t\t\t\tfor k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
-                      {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
-                      v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
-                      {\n\t// +usage=Specify the domain you want to expose\n\tdomain:
-                      string\n\n\t// +usage=Specify the mapping relationship between the
-                      http path and the workload port\n\thttp: [string]: int\n}\n"
-                status:
-                  customStatus: |-
-                    let igs = context.outputs.ingress.status.loadBalancer.ingress
-                    if igs == _|_ {
-                      message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
-                    }
-                    if len(igs) > 0 {
-                      if igs[0].ip != _|_ {
-                        message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
-                      }
-                      if igs[0].ip == _|_ {
-                        message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
-                      }
-                    }
-                  healthPolicy: |
-                    isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
-            type: raw
-          - name: register-grafana-datasource
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: TraitDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Add a datasource to Grafana
-                name: register-grafana-datasource
-                namespace: vela-system
-              spec:
-                schematic:
-                  cue:
-                    template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                      \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                      \                  parameter.grafanaServiceName\n\t\t\tnamespace:
-                      \                parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                      \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                      parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
-                      \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
-                      \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
-                      parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
-                      \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
-                      \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
-                      \                     string\n\taccess:                    *\"proxy\"
-                      | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
-                      | string\n}\n"
-            type: raw
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-    status:
-      observedGeneration: 0
-kind: ConfigMap
-metadata:
-  annotations:
-    addons.oam.dev/description: Preparations that observability need
-    addons.oam.dev/name: observability-asset
-  labels:
-    addons.oam.dev/type: observability-asset
-  name: observability-asset
-  namespace: {{.Values.systemDefinitionNamespace}}

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

@@ -1,141 +1,243 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: An out of the box solution for KubeVela observability
       name: observability
-      namespace: observability
+      namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: grafana-registration
-            properties:
-              chart: ./chart
-              git:
-                branch: master
-              repoType: git
-              targetNamespace: observability
-              url: https://github.com/oam-dev/grafana-registration
-              values:
-                replicaCount: 1
-            type: helm
-          - name: grafana
-            properties:
-              chart: grafana
-              releaseName: grafana
-              repoType: helm
-              targetNamespace: observability
-              url: https://charts.kubevela.net/addons
-              version: 6.14.1
-            traits:
-            - properties:
-                domain: '[[ index .Args "grafana-domain" ]]'
-                http:
-                  /: 80
-              type: pure-ingress
-            - properties:
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                urls:
-                - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
-                - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
-                - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
-                - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
-              type: import-grafana-dashboard
-            type: helm
-          - name: loki
-            properties:
-              chart: loki-stack
-              releaseName: loki
-              repoType: helm
-              targetNamespace: observability
-              url: https://charts.kubevela.net/addons
-              version: 2.4.1
-            traits:
-            - properties:
-                access: proxy
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                name: loki
-                namespace: observability
-                service: loki
-                type: loki
-              type: register-grafana-datasource
-            type: helm
-          - name: prometheus-server
-            properties:
-              chart: prometheus
-              releaseName: prometheus
-              repoType: helm
-              targetNamespace: observability
-              url: https://charts.kubevela.net/addons
-              values:
-                alertmanager:
-                  persistentVolume:
-                    enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true"
-                      ]]'
-                    size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
-                    storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
-                server:
-                  persistentVolume:
-                    enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
-                    size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
-                    storageClass: '[[ index .Args "server-pvc-class" ]]'
-              version: 14.4.1
-            traits:
-            - properties:
-                access: proxy
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                name: prometheus
-                namespace: observability
-                service: prometheus-server
-                type: prometheus
-              type: register-grafana-datasource
-            type: helm
-          - name: kube-state-metrics
-            properties:
-              chart: kube-state-metrics
-              repoType: helm
-              targetNamespace: observability
-              url: https://charts.kubevela.net/addons
-              values:
-                image:
-                  repository: oamdev/kube-state-metrics
-                  tag: v2.1.0
-              version: 3.4.1
-            type: helm
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
+      components:
+      - name: ns-observability
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: observability
+        type: raw
+      - name: import-grafana-dashboard-traitdef
+        properties:
           apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
-      - ref:
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Import dashboards to Grafana
+            name: import-grafana-dashboard
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
+                  {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:   *\"default\"
+                  | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
+                  *\"default\" | string\n\turls: [...string]\n}\n"
+        type: raw
+      - name: pure-ingress-traitdef
+        properties:
           apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: observability-asset
-          namespace: vela-system
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Enable public web traffic for the component
+                without creating a Service.
+            name: pure-ingress
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
+                  \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec: {\n\t\trules:
+                  [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths: [\n\t\t\t\t\tfor
+                  k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
+                  {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
+                  v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
+                  {\n\t// +usage=Specify the domain you want to expose\n\tdomain: string\n\n\t//
+                  +usage=Specify the mapping relationship between the http path and the
+                  workload port\n\thttp: [string]: int\n}\n"
+            status:
+              customStatus: |-
+                let igs = context.outputs.ingress.status.loadBalancer.ingress
+                if igs == _|_ {
+                  message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+                }
+                if len(igs) > 0 {
+                  if igs[0].ip != _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+                  }
+                  if igs[0].ip == _|_ {
+                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+                  }
+                }
+              healthPolicy: |
+                isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+        type: raw
+      - name: register-grafana-datasource-traitdef
+        properties:
+          apiVersion: core.oam.dev/v1beta1
+          kind: TraitDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Add a datasource to Grafana
+            name: register-grafana-datasource
+            namespace: vela-system
+          spec:
+            schematic:
+              cue:
+                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+                  \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+                  parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
+                  \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
+                  \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
+                  parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
+                  \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
+                  \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
+                  \                     string\n\taccess:                    *\"proxy\"
+                  | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
+                  | string\n}\n"
+        type: raw
+      - name: grafana-registration
+        properties:
+          chart: ./chart
+          git:
+            branch: master
+          repoType: git
+          targetNamespace: observability
+          url: https://github.com/oam-dev/grafana-registration
+          values:
+            replicaCount: 1
+        type: helm
+      - name: grafana
+        properties:
+          chart: grafana
+          releaseName: grafana
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          version: 6.14.1
+        traits:
+        - properties:
+            domain: '[[ index .Args "grafana-domain" ]]'
+            http:
+              /: 80
+          type: pure-ingress
+        - properties:
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            urls:
+            - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
+            - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
+            - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
+            - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
+          type: import-grafana-dashboard
+        type: helm
+      - name: loki
+        properties:
+          chart: loki-stack
+          releaseName: loki
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          version: 2.4.1
+        traits:
+        - properties:
+            access: proxy
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            name: loki
+            namespace: observability
+            service: loki
+            type: loki
+          type: register-grafana-datasource
+        type: helm
+      - name: prometheus-server
+        properties:
+          chart: prometheus
+          releaseName: prometheus
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          values:
+            alertmanager:
+              persistentVolume:
+                enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
+                size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
+                storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
+            server:
+              persistentVolume:
+                enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
+                size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
+                storageClass: '[[ index .Args "server-pvc-class" ]]'
+          version: 14.4.1
+        traits:
+        - properties:
+            access: proxy
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            name: prometheus
+            namespace: observability
+            service: prometheus-server
+            type: prometheus
+          type: register-grafana-datasource
+        type: helm
+      - name: kube-state-metrics
+        properties:
+          chart: kube-state-metrics
+          repoType: helm
+          targetNamespace: observability
+          url: https://charts.kubevela.net/addons
+          values:
+            image:
+              repository: oamdev/kube-state-metrics
+              tag: v2.1.0
+          version: 3.4.1
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-observability
+          type: apply-component
+        - name: apply-trait-1
+          properties:
+            component: import-grafana-dashboard-traitdef
+          type: apply-component
+        - name: apply-trait-2
+          properties:
+            component: pure-ingress-traitdef
+          type: apply-component
+        - name: apply-trait-3
+          properties:
+            component: register-grafana-datasource-traitdef
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: Prometheus is an open-source systems monitoring and
@@ -10,31 +10,30 @@ data:
       name: prometheus
       namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: prometheus
-            properties:
-              chart: premetheus
-              repoType: helm
-              url: https://prometheus-community.github.io/helm-charts
-            type: helm
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
-          apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
+      components:
+      - name: prometheus
+        properties:
+          chart: premetheus
+          repoType: helm
+          url: https://prometheus-community.github.io/helm-charts
+        type: helm
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-resources
+          type: apply-application
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
@@ -10,50 +10,46 @@ data:
       name: terraform-provider-alibaba
       namespace: default
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: alibaba-account-creds
-            properties:
-              apiVersion: v1
-              kind: Secret
-              metadata:
+      components:
+      - name: alibaba-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: alibaba-provider-secret
+            namespace: vela-system
+          stringData:
+            credentials: |
+              accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
+              accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
+              securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
+          type: Opaque
+        type: raw
+      - name: default
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: default
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
                 name: alibaba-account-creds
                 namespace: vela-system
-              stringData:
-                credentials: |
-                  accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
-                  accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
-                  securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
-              type: Opaque
-            type: raw
-          - name: default
-            properties:
-              apiVersion: terraform.core.oam.dev/v1beta1
-              kind: Provider
-              metadata:
-                name: default
-                namespace: default
-              spec:
-                credentials:
-                  secretRef:
-                    key: credentials
-                    name: alibaba-account-creds
-                    namespace: vela-system
-                  source: Secret
-                provider: alibaba
-                region: '[[ index .Args "ALICLOUD_REGION" ]]'
-            type: raw
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
+              source: Secret
+            provider: alibaba
+            region: '[[ index .Args "ALICLOUD_REGION" ]]'
+        type: raw
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: Kubernetes Terraform Controller for Azure
@@ -10,50 +10,46 @@ data:
       name: terraform-provider-azure
       namespace: default
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: azure-account-creds
-            properties:
-              apiVersion: v1
-              kind: Secret
-              metadata:
+      components:
+      - name: azure-account-creds
+        properties:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: azure-account-creds
+            namespace: vela-system
+          stringData:
+            credentials: |
+              armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
+              armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
+              armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
+              armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
+          type: Opaque
+        type: raw
+      - name: azure
+        properties:
+          apiVersion: terraform.core.oam.dev/v1beta1
+          kind: Provider
+          metadata:
+            name: azure
+            namespace: default
+          spec:
+            credentials:
+              secretRef:
+                key: credentials
                 name: azure-account-creds
                 namespace: vela-system
-              stringData:
-                credentials: |
-                  armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
-                  armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
-                  armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
-                  armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
-              type: Opaque
-            type: raw
-          - name: azure
-            properties:
-              apiVersion: terraform.core.oam.dev/v1beta1
-              kind: Provider
-              metadata:
-                name: azure
-                namespace: default
-              spec:
-                credentials:
-                  secretRef:
-                    key: credentials
-                    name: azure-account-creds
-                    namespace: vela-system
-                  source: Secret
-                provider: azure
-            type: raw
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
+              source: Secret
+            provider: azure
+        type: raw
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
@@ -10,443 +10,485 @@ data:
       name: terraform
       namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: terraform-controller
-            properties:
-              chart: terraform-controller
-              repoType: helm
-              url: https://charts.kubevela.net/addons
-              version: 0.1.19
-            type: helm
-          - name: terraform-system
-            properties:
-              apiVersion: v1
-              kind: Namespace
-              metadata:
-                name: terraform-system
-            type: raw
-          - name: alibaba-ack
-            properties:
-              apiVersion: core.oam.dev/v1beta1
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud ACK cluster
-                labels:
-                  type: terraform
-                name: alibaba-ack
-                namespace: vela-system
-              spec:
-                schematic:
-                  terraform:
-                    configuration: |
-                      module "kubernetes" {
-                        source = "github.com/zzxwill/terraform-alicloud-kubernetes"
-                        new_nat_gateway = true
-                        vpc_name = var.vpc_name
-                        vpc_cidr = var.vpc_cidr
-                        vswitch_name_prefix = var.vswitch_name_prefix
-                        vswitch_cidrs = var.vswitch_cidrs
-                        master_instance_types = var.master_instance_types
-                        worker_instance_types = var.worker_instance_types
-                        k8s_pod_cidr = var.k8s_pod_cidr
-                        k8s_service_cidr = var.k8s_service_cidr
-                        k8s_worker_number = var.k8s_worker_number
-                        cpu_core_count = var.cpu_core_count
-                        memory_size = var.memory_size
-                        zone_id = var.zone_id
-                        k8s_version = var.k8s_version
-                        k8s_name_prefix = var.k8s_name_prefix
-                      }
-                      ######################
-                      # Instance types variables
-                      ######################
-                      variable "cpu_core_count" {
-                        description = "CPU core count is used to fetch instance types."
-                        type = number
-                        default = 4
-                      }
-                      variable "memory_size" {
-                        description = "Memory size used to fetch instance types."
-                        type = number
-                        default = 8
-                      }
-                      ######################
-                      # VPC variables
-                      ######################
-                      variable "vpc_name" {
-                        description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
-                        type = string
-                        default = "tf-k8s-vpc"
-                      }
-                      variable "vpc_cidr" {
-                        description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
-                        type = string
-                        default = "10.0.0.0/8"
-                      }
-                      ######################
-                      # VSwitch variables
-                      ######################
-                      variable "vswitch_name_prefix" {
-                        type = string
-                        description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
-                        default = "tf-k8s-vsw"
-                      }
-                      variable "number_format" {
-                        description = "The number format used to output."
-                        type = string
-                        default = "%02d"
-                      }
-                      variable "vswitch_ids" {
-                        description = "List of existing vswitch id."
-                        type = list
-                        default = []
-                      }
-                      variable "vswitch_cidrs" {
-                        description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
-                        type = list
-                        default = [
-                          "10.1.0.0/16",
-                          "10.2.0.0/16",
-                          "10.3.0.0/16"]
-                      }
-                      variable "k8s_name_prefix" {
-                        description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
-                        type = string
-                        default = "poc"
-                      }
-                      variable "new_nat_gateway" {
-                        type = bool
-                        description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
-                        default = true
-                      }
-                      variable "master_instance_types" {
-                        description = "The ecs instance types used to launch master nodes."
-                        type = list
-                        default = [
-                          # hongkong
-                          "ecs.sn1ne.xlarge",
-                          # hongkong
-                          "ecs.c6.xlarge",
-                          # hongkong
-                          "ecs.c4.xlarge",
-                          # hongkong
-                          "ecs.c5.xlarge",
-                          "ecs.n4.xlarge",
-                          # "ecs.n1.large",
-                          # "ecs.sn1.large",
-                          # "ecs.s6-c1m2.xlarge",
-                          # "ecs.c6e.xlarge"
-                        ]
-                      }
-                      variable "worker_instance_types" {
-                        description = "The ecs instance types used to launch worker nodes."
-                        type = list
-                        default = [
-                          # hongkong
-                          "ecs.sn1ne.xlarge",
-                          # hongkong
-                          "ecs.c6.xlarge",
-                          # hongkong
-                          "ecs.c4.xlarge",
-                          # hongkong
-                          "ecs.c6e.xlarge",
-                          "ecs.n4.xlarge",
-                          //    "ecs.n1.large",
-                          //    "ecs.sn1.large",
-                          //    "ecs.s6-c1m2.xlarge"
-                        ]
-                      }
-                      variable "node_cidr_mask" {
-                        type = number
-                        description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
-                        default = 24
-                      }
-                      variable "enable_ssh" {
-                        description = "Enable login to the node through SSH."
-                        type = bool
-                        default = true
-                      }
-                      variable "install_cloud_monitor" {
-                        description = "Install cloud monitor agent on ECS."
-                        type = bool
-                        default = true
-                      }
-                      variable "cpu_policy" {
-                        type = string
-                        description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
-                        default = "none"
-                      }
-                      variable "proxy_mode" {
-                        description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
-                        type = string
-                        default = "iptables"
-                      }
-                      variable "password" {
-                        description = "The password of ECS instance."
-                        type = string
-                        default = "Just4Test"
-                      }
-                      variable "k8s_worker_number" {
-                        description = "The number of worker nodes in kubernetes cluster."
-                        type = number
-                        default = 2
-                      }
-                      # k8s_pod_cidr is only for flannel network
-                      variable "k8s_pod_cidr" {
-                        description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
-                        type = string
-                        default = "172.20.0.0/16"
-                      }
-                      variable "k8s_service_cidr" {
-                        description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
-                        type = string
-                        default = "192.168.0.0/16"
-                      }
-                      variable "k8s_version" {
-                        description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
-                        type = string
-                        default = "1.20.4-aliyun.1"
-                      }
-                      variable "zone_id" {
-                        description = "Availability Zone ID"
-                        type = string
-                        default = "cn-hongkong-b"
-                        # "cn-beijing-a"
-                      }
-                      output "name" {
-                        value = module.kubernetes.name
-                      }
-                      output "kubeconfig" {
-                        value = module.kubernetes.kubeconfig
-                      }
-                      output "cluster_ca_cert" {
-                        value = module.kubernetes.cluster_ca_cert
-                      }
-                      output "client_cert" {
-                        value = module.kubernetes.client_cert
-                      }
-                      output "client_key" {
-                        value = module.kubernetes.client_key
-                      }
-                      output "api_server_internet" {
-                        value = module.kubernetes.api_server_internet
-                      }
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: alibaba-eip
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud Elastic IP
-                labels:
-                  type: terraform
-                name: alibaba-eip
-                namespace: vela-system
-              spec:
-                schematic:
-                  terraform:
-                    configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
-                    type: remote
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: alibaba-oss
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud OSS object
-                labels:
-                  type: terraform
-                name: alibaba-oss
-                namespace: vela-system
-              spec:
-                schematic:
-                  terraform:
-                    configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n
-                      \ bucket = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\"
-                      {\n  value = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
-                      \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
-                      \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
-                      ACL, supported 'private', 'public-read', 'public-read-write'\"\n
-                      \ default = \"private\"\n  type = string\n} \n"
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: alibaba-rds
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Alibaba
-                    Cloud RDS object
-                labels:
-                  type: terraform
-                name: alibaba-rds
-                namespace: vela-system
-              spec:
-                schematic:
-                  terraform:
-                    configuration: |
-                      module "rds" {
-                        source = "terraform-alicloud-modules/rds/alicloud"
-                        engine = "MySQL"
-                        engine_version = "8.0"
-                        instance_type = "rds.mysql.c1.large"
-                        instance_storage = "20"
-                        instance_name = var.instance_name
-                        account_name = var.account_name
-                        password = var.password
-                      }
-
-                      output "DB_NAME" {
-                        value = module.rds.this_db_instance_name
-                      }
-                      output "DB_USER" {
-                        value = module.rds.this_db_database_account
-                      }
-                      output "DB_PORT" {
-                        value = module.rds.this_db_instance_port
-                      }
-                      output "DB_HOST" {
-                        value = module.rds.this_db_instance_connection_string
-                      }
-                      output "DB_PASSWORD" {
-                        value = var.password
-                      }
-
-                      variable "instance_name" {
-                        description = "RDS instance name"
-                        type = string
-                        default = "poc"
-                      }
-
-                      variable "account_name" {
-                        description = "RDS instance user account name"
-                        type = string
-                        default = "oam"
-                      }
-
-                      variable "password" {
-                        description = "RDS instance account password"
-                        type = string
-                        default = "Xyfff83jfewGGfaked"
-                      }
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-          - name: azure-database-mariadb
-            properties:
-              apiVersion: core.oam.dev/v1alpha2
-              kind: ComponentDefinition
-              metadata:
-                annotations:
-                  definition.oam.dev/description: Terraform configuration for Azure Database
-                    Mariadb
-                  provider: azure
-                labels:
-                  type: terraform
-                name: azure-database-mariadb
-                namespace: vela-system
-              spec:
-                schematic:
-                  terraform:
-                    configuration: |
-                      # Configure the Microsoft Azure Provider
-                      provider "azurerm" {
-                        features {}
-                      }
-
-                      resource "azurerm_resource_group" "example" {
-                        name = "tfex-mariadb-database-RG"
-                        location = "West Europe"
-                      }
-
-                      resource "azurerm_mariadb_server" "example" {
-                        name = "mariadb-svr-sample"
-                        location = azurerm_resource_group.example.location
-                        resource_group_name = azurerm_resource_group.example.name
-
-                        sku_name = "B_Gen5_2"
-
-                        storage_mb = 51200
-                        backup_retention_days = 7
-                        geo_redundant_backup_enabled = false
-
-                        administrator_login = var.username
-                        administrator_login_password = var.password
-                        version = "10.2"
-                        ssl_enforcement_enabled = true
-                      }
-
-                      resource "azurerm_mariadb_database" "example" {
-                        name = var.name
-                        resource_group_name = azurerm_resource_group.example.name
-                        server_name = azurerm_mariadb_server.example.name
-                        charset = "utf8"
-                        collation = "utf8_general_ci"
-                      }
-
-                      variable "name" {
-                        default = "mariadb_database"
-                        type = string
-                        description = "Database instance name"
-                      }
-
-                      variable "username" {
-                        default = "acctestun"
-                        type = string
-                        description = "Database instance username"
-                      }
-
-                      variable "password" {
-                        default = "H@Sh1CoR3!faked"
-                        type = string
-                        description = "Database instance password"
-                      }
-                    providerRef:
-                      name: azure
-                      namespace: default
-                workload:
-                  definition:
-                    apiVersion: terraform.core.oam.dev/v1beta1
-                    kind: Configuration
-            type: raw
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
+      components:
+      - name: ns-terraform-system
+        properties:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: terraform-system
+        type: raw
+      - name: terraform-controller
+        properties:
+          chart: terraform-controller
+          repoType: helm
+          url: https://charts.kubevela.net/addons
+          version: 0.1.19
+        type: helm
+      - name: alibaba-ack
+        properties:
           apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                ACK cluster
+            labels:
+              type: terraform
+            name: alibaba-ack
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  module "kubernetes" {
+                    source = "github.com/zzxwill/terraform-alicloud-kubernetes"
+                    new_nat_gateway = true
+                    vpc_name = var.vpc_name
+                    vpc_cidr = var.vpc_cidr
+                    vswitch_name_prefix = var.vswitch_name_prefix
+                    vswitch_cidrs = var.vswitch_cidrs
+                    master_instance_types = var.master_instance_types
+                    worker_instance_types = var.worker_instance_types
+                    k8s_pod_cidr = var.k8s_pod_cidr
+                    k8s_service_cidr = var.k8s_service_cidr
+                    k8s_worker_number = var.k8s_worker_number
+                    cpu_core_count = var.cpu_core_count
+                    memory_size = var.memory_size
+                    zone_id = var.zone_id
+                    k8s_version = var.k8s_version
+                    k8s_name_prefix = var.k8s_name_prefix
+                  }
+                  ######################
+                  # Instance types variables
+                  ######################
+                  variable "cpu_core_count" {
+                    description = "CPU core count is used to fetch instance types."
+                    type = number
+                    default = 4
+                  }
+                  variable "memory_size" {
+                    description = "Memory size used to fetch instance types."
+                    type = number
+                    default = 8
+                  }
+                  ######################
+                  # VPC variables
+                  ######################
+                  variable "vpc_name" {
+                    description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
+                    type = string
+                    default = "tf-k8s-vpc"
+                  }
+                  variable "vpc_cidr" {
+                    description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
+                    type = string
+                    default = "10.0.0.0/8"
+                  }
+                  ######################
+                  # VSwitch variables
+                  ######################
+                  variable "vswitch_name_prefix" {
+                    type = string
+                    description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
+                    default = "tf-k8s-vsw"
+                  }
+                  variable "number_format" {
+                    description = "The number format used to output."
+                    type = string
+                    default = "%02d"
+                  }
+                  variable "vswitch_ids" {
+                    description = "List of existing vswitch id."
+                    type = list
+                    default = []
+                  }
+                  variable "vswitch_cidrs" {
+                    description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
+                    type = list
+                    default = [
+                      "10.1.0.0/16",
+                      "10.2.0.0/16",
+                      "10.3.0.0/16"]
+                  }
+                  variable "k8s_name_prefix" {
+                    description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
+                    type = string
+                    default = "poc"
+                  }
+                  variable "new_nat_gateway" {
+                    type = bool
+                    description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
+                    default = true
+                  }
+                  variable "master_instance_types" {
+                    description = "The ecs instance types used to launch master nodes."
+                    type = list
+                    default = [
+                      # hongkong
+                      "ecs.sn1ne.xlarge",
+                      # hongkong
+                      "ecs.c6.xlarge",
+                      # hongkong
+                      "ecs.c4.xlarge",
+                      # hongkong
+                      "ecs.c5.xlarge",
+                      "ecs.n4.xlarge",
+                      # "ecs.n1.large",
+                      # "ecs.sn1.large",
+                      # "ecs.s6-c1m2.xlarge",
+                      # "ecs.c6e.xlarge"
+                    ]
+                  }
+                  variable "worker_instance_types" {
+                    description = "The ecs instance types used to launch worker nodes."
+                    type = list
+                    default = [
+                      # hongkong
+                      "ecs.sn1ne.xlarge",
+                      # hongkong
+                      "ecs.c6.xlarge",
+                      # hongkong
+                      "ecs.c4.xlarge",
+                      # hongkong
+                      "ecs.c6e.xlarge",
+                      "ecs.n4.xlarge",
+                      //    "ecs.n1.large",
+                      //    "ecs.sn1.large",
+                      //    "ecs.s6-c1m2.xlarge"
+                    ]
+                  }
+                  variable "node_cidr_mask" {
+                    type = number
+                    description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
+                    default = 24
+                  }
+                  variable "enable_ssh" {
+                    description = "Enable login to the node through SSH."
+                    type = bool
+                    default = true
+                  }
+                  variable "install_cloud_monitor" {
+                    description = "Install cloud monitor agent on ECS."
+                    type = bool
+                    default = true
+                  }
+                  variable "cpu_policy" {
+                    type = string
+                    description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
+                    default = "none"
+                  }
+                  variable "proxy_mode" {
+                    description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
+                    type = string
+                    default = "iptables"
+                  }
+                  variable "password" {
+                    description = "The password of ECS instance."
+                    type = string
+                    default = "Just4Test"
+                  }
+                  variable "k8s_worker_number" {
+                    description = "The number of worker nodes in kubernetes cluster."
+                    type = number
+                    default = 2
+                  }
+                  # k8s_pod_cidr is only for flannel network
+                  variable "k8s_pod_cidr" {
+                    description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
+                    type = string
+                    default = "172.20.0.0/16"
+                  }
+                  variable "k8s_service_cidr" {
+                    description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
+                    type = string
+                    default = "192.168.0.0/16"
+                  }
+                  variable "k8s_version" {
+                    description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
+                    type = string
+                    default = "1.20.4-aliyun.1"
+                  }
+                  variable "zone_id" {
+                    description = "Availability Zone ID"
+                    type = string
+                    default = "cn-hongkong-b"
+                    # "cn-beijing-a"
+                  }
+                  output "name" {
+                    value = module.kubernetes.name
+                  }
+                  output "kubeconfig" {
+                    value = module.kubernetes.kubeconfig
+                  }
+                  output "cluster_ca_cert" {
+                    value = module.kubernetes.cluster_ca_cert
+                  }
+                  output "client_cert" {
+                    value = module.kubernetes.client_cert
+                  }
+                  output "client_key" {
+                    value = module.kubernetes.client_key
+                  }
+                  output "api_server_internet" {
+                    value = module.kubernetes.api_server_internet
+                  }
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-eip
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                Elastic IP
+            labels:
+              type: terraform
+            name: alibaba-eip
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
+                type: remote
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-oss
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                OSS object
+            labels:
+              type: terraform
+            name: alibaba-oss
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n  bucket
+                  = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\" {\n  value
+                  = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
+                  \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
+                  \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
+                  ACL, supported 'private', 'public-read', 'public-read-write'\"\n  default
+                  = \"private\"\n  type = string\n} \n"
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: alibaba-rds
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+                RDS object
+            labels:
+              type: terraform
+            name: alibaba-rds
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  module "rds" {
+                    source = "terraform-alicloud-modules/rds/alicloud"
+                    engine = "MySQL"
+                    engine_version = "8.0"
+                    instance_type = "rds.mysql.c1.large"
+                    instance_storage = "20"
+                    instance_name = var.instance_name
+                    account_name = var.account_name
+                    password = var.password
+                  }
+
+                  output "DB_NAME" {
+                    value = module.rds.this_db_instance_name
+                  }
+                  output "DB_USER" {
+                    value = module.rds.this_db_database_account
+                  }
+                  output "DB_PORT" {
+                    value = module.rds.this_db_instance_port
+                  }
+                  output "DB_HOST" {
+                    value = module.rds.this_db_instance_connection_string
+                  }
+                  output "DB_PASSWORD" {
+                    value = var.password
+                  }
+
+                  variable "instance_name" {
+                    description = "RDS instance name"
+                    type = string
+                    default = "poc"
+                  }
+
+                  variable "account_name" {
+                    description = "RDS instance user account name"
+                    type = string
+                    default = "oam"
+                  }
+
+                  variable "password" {
+                    description = "RDS instance account password"
+                    type = string
+                    default = "Xyfff83jfewGGfaked"
+                  }
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      - name: azure-database-mariadb
+        properties:
+          apiVersion: core.oam.dev/v1alpha2
+          kind: ComponentDefinition
+          metadata:
+            annotations:
+              definition.oam.dev/description: Terraform configuration for Azure Database
+                Mariadb
+              provider: azure
+            labels:
+              type: terraform
+            name: azure-database-mariadb
+            namespace: vela-system
+          spec:
+            schematic:
+              terraform:
+                configuration: |
+                  # Configure the Microsoft Azure Provider
+                  provider "azurerm" {
+                    features {}
+                  }
+
+                  resource "azurerm_resource_group" "example" {
+                    name = var.resource_group
+                    location = var.location
+                  }
+
+                  resource "azurerm_mariadb_server" "example" {
+                    name = var.server_name
+                    location = var.location
+                    resource_group_name = azurerm_resource_group.example.name
+
+                    sku_name = "B_Gen5_2"
+
+                    storage_mb = 51200
+                    backup_retention_days = 7
+                    geo_redundant_backup_enabled = false
+
+                    administrator_login = var.username
+                    administrator_login_password = var.password
+                    version = "10.2"
+                    ssl_enforcement_enabled = true
+                  }
+
+                  resource "azurerm_mariadb_database" "example" {
+                    name = var.db_name
+                    resource_group_name = azurerm_resource_group.example.name
+                    server_name = azurerm_mariadb_server.example.name
+                    charset = "utf8"
+                    collation = "utf8_general_ci"
+                  }
+
+                  variable "server_name" {
+                    type = string
+                    description = "mariadb server name"
+                    default = "mariadb-svr-sample"
+                  }
+
+                  variable "db_name" {
+                    default = "backend"
+                    type = string
+                    description = "Database instance name"
+                  }
+
+                  variable "username" {
+                    default = "acctestun"
+                    type = string
+                    description = "Database instance username"
+                  }
+
+                  variable "password" {
+                    default = "H@Sh1CoR3!faked"
+                    type = string
+                    description = "Database instance password"
+                  }
+
+                  variable "location" {
+                    description = "Azure location"
+                    type = string
+                    default = "West Europe"
+                  }
+
+                  variable "resource_group" {
+                    description = "Resource group"
+                    type = string
+                    default = "kubevela-group"
+                  }
+
+                  output "SERVER_NAME" {
+                    value = var.server_name
+                  }
+
+                  output "DB_NAME" {
+                    value = var.db_name
+                  }
+                  output "DB_USER" {
+                    value = var.username
+                  }
+                  output "DB_PASSWORD" {
+                    sensitive = true
+                    value = var.password
+                  }
+                  output "DB_PORT" {
+                    value = "3306"
+                  }
+                  output "DB_HOST" {
+                    value = azurerm_mariadb_server.example.fqdn
+                  }
+                providerRef:
+                  name: azure
+                  namespace: default
+            workload:
+              definition:
+                apiVersion: terraform.core.oam.dev/v1beta1
+                kind: Configuration
+        type: raw
+      workflow:
+        steps:
+        - name: checking-depends-on
+          properties:
+            name: fluxcd
+            namespace: vela-system
+          type: depends-on-app
+        - name: apply-ns
+          properties:
+            component: ns-terraform-system
+          type: apply-component
+        - name: apply-resources
+          type: apply-remaining
     status:
-      observedGeneration: 0
+      rollout:
+        batchRollingState: ""
+        currentBatch: 0
+        lastTargetAppRevision: ""
+        rollingState: ""
+        upgradedReadyReplicas: 0
+        upgradedReplicas: 0
 kind: ConfigMap
 metadata:
   annotations:

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

@@ -0,0 +1,42 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export2config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export data to config map for your workflow steps
+  name: export2config
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value: {
+        		apiVersion: "v1"
+        		kind:       "ConfigMap"
+        		metadata: {
+        			name: parameter.configName
+        			if parameter.namespace != _|_ {
+        				namespace: parameter.namespace
+        			}
+        			if parameter.namespace == _|_ {
+        				namespace: context.namespace
+        			}
+        		}
+        		data: parameter.data
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the name of the config map
+        	configName: string
+        	// +usage=Specify the namespace of the config map
+        	namespace?: string
+        	// +usage=Specify the data of config map
+        	data: {}
+        }
+

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

@@ -0,0 +1,47 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export2secret.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export data to secret for your workflow steps
+  name: export2secret
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value: {
+        		apiVersion: "v1"
+        		kind:       "Secret"
+        		if parameter.type != _|_ {
+        			type: parameter.type
+        		}
+        		metadata: {
+        			name: parameter.secretName
+        			if parameter.namespace != _|_ {
+        				namespace: parameter.namespace
+        			}
+        			if parameter.namespace == _|_ {
+        				namespace: context.namespace
+        			}
+        		}
+        		stringData: parameter.data
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the name of the secret
+        	secretName: string
+        	// +usage=Specify the namespace of the secret
+        	namespace?: string
+        	// +usage=Specify the type of the secret
+        	type?: string
+        	// +usage=Specify the data of secret
+        	data: {}
+        }
+

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

@@ -0,0 +1,58 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/read-object.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Read objects for your workflow steps
+  name: read-object
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: {
+        	if parameter.apiVersion == _|_ && parameter.kind == _|_ {
+        		op.#Read & {
+        			value: {
+        				apiVersion: "core.oam.dev/v1beta1"
+        				kind:       "Application"
+        				metadata: {
+        					name: parameter.name
+        					if parameter.namespace != _|_ {
+        						namespace: parameter.namespace
+        					}
+        				}
+        			}
+        		}
+        	}
+        	if parameter.apiVersion != _|_ || parameter.kind != _|_ {
+        		op.#Read & {
+        			value: {
+        				apiVersion: parameter.apiVersion
+        				kind:       parameter.kind
+        				metadata: {
+        					name: parameter.name
+        					if parameter.namespace != _|_ {
+        						namespace: parameter.namespace
+        					}
+        				}
+        			}
+        		}
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the apiVersion of the object, defaults to core.oam.dev/v1beta1
+        	apiVersion?: string
+        	// +usage=Specify the kind of the object, defaults to Application
+        	kind?: string
+        	// +usage=Specify the name of the object
+        	name: string
+        	// +usage=Specify the namespace of the object
+        	namespace?: string
+        }
+

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

@@ -23,6 +23,10 @@ spec:
         				name:  context.name
         				image: parameter.image
 
+        				if parameter["imagePullPolicy"] != _|_ {
+        					imagePullPolicy: parameter.imagePullPolicy
+        				}
+
         				if parameter["cmd"] != _|_ {
         					command: parameter.cmd
         				}
@@ -85,6 +89,13 @@ spec:
         					}}]
         			}
 
+        			if parameter["imagePullSecrets"] != _|_ {
+        				imagePullSecrets: [ for v in parameter.imagePullSecrets {
+        					name: v
+        				},
+        				]
+        			}
+
         		}
         	}
         }
@@ -97,6 +108,12 @@ spec:
         	// +short=i
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy?: string
+
+        	// +usage=Specify image pull secrets for your service
+        	imagePullSecrets?: [...string]
+
         	// +usage=Define the job restart policy, the value can only be Never or OnFailure. By default, it's Never.
         	restart: *"Never" | string
 

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

@@ -13,11 +13,18 @@ spec:
       template: |
         import (
         	"vela/op"
+        	"encoding/base64"
         )
 
         parameter: {
         	dingding?: {
-        		url: string
+        		url: {
+        			address?: string
+        			fromSecret?: {
+        				name: string
+        				key:  string
+        			}
+        		}
         		message: {
         			text?: *null | {
         				content: string
@@ -62,7 +69,13 @@ spec:
         	}
 
         	slack?: {
-        		url: string
+        		url: {
+        			address?: string
+        			fromSecret?: {
+        				name: string
+        				key:  string
+        			}
+        		}
         		message: {
         			text:         string
         			blocks?:      *null | [...block]
@@ -121,19 +134,61 @@ spec:
         	url?:         string
         }
         // send webhook notification
-        ding: {
+        ding: op.#Steps & {
         	if parameter.dingding != _|_ {
-        		op.#DingTalk & {
-        			message: parameter.dingding.message
-        			dingUrl: parameter.dingding.url
+        		if parameter.dingding.url.address != _|_ {
+        			ding1: op.#DingTalk & {
+        				message: parameter.dingding.message
+        				dingUrl: parameter.dingding.url.address
+        			}
+        		}
+        		if parameter.dingding.url.fromSecret != _|_ && parameter.dingding.url.address == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					apiVersion: "v1"
+        					kind:       "Secret"
+        					metadata: {
+        						name:      parameter.dingding.url.fromSecret.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.fromSecret.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			ding2:       op.#DingTalk & {
+        				message: parameter.dingding.message
+        				dingUrl: stringValue.str
+        			}
         		}
         	}
         }
-        slack: {
+        slack: op.#Steps & {
         	if parameter.slack != _|_ {
-        		op.#Slack & {
-        			message:  parameter.slack.message
-        			slackUrl: parameter.slack.url
+        		if parameter.slack.url.address != _|_ {
+        			slack1: op.#Slack & {
+        				message:  parameter.slack.message
+        				slackUrl: parameter.slack.url.address
+        			}
+        		}
+        		if parameter.slack.url.fromSecret != _|_ && parameter.slack.url.address == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					kind:       "Secret"
+        					apiVersion: "v1"
+        					metadata: {
+        						name:      parameter.slack.url.fromSecret.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.fromSecret.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			slack2:      op.#Slack & {
+        				message:  parameter.slack.message
+        				slackUrl: stringValue.str
+        			}
         		}
         	}
         }

charts/vela-core/values.yaml

@@ -73,7 +73,7 @@ admissionWebhooks:
     enabled: true
     image:
       repository: oamdev/kube-webhook-certgen
-      tag: v2.2
+      tag: v2.3
       pullPolicy: IfNotPresent
     affinity: {}
     tolerations: []

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

@@ -0,0 +1,42 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export2config.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export data to config map for your workflow steps
+  name: export2config
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value: {
+        		apiVersion: "v1"
+        		kind:       "ConfigMap"
+        		metadata: {
+        			name: parameter.configName
+        			if parameter.namespace != _|_ {
+        				namespace: parameter.namespace
+        			}
+        			if parameter.namespace == _|_ {
+        				namespace: context.namespace
+        			}
+        		}
+        		data: parameter.data
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the name of the config map
+        	configName: string
+        	// +usage=Specify the namespace of the config map
+        	namespace?: string
+        	// +usage=Specify the data of config map
+        	data: {}
+        }
+

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

@@ -0,0 +1,47 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/export2secret.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Export data to secret for your workflow steps
+  name: export2secret
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        apply: op.#Apply & {
+        	value: {
+        		apiVersion: "v1"
+        		kind:       "Secret"
+        		if parameter.type != _|_ {
+        			type: parameter.type
+        		}
+        		metadata: {
+        			name: parameter.secretName
+        			if parameter.namespace != _|_ {
+        				namespace: parameter.namespace
+        			}
+        			if parameter.namespace == _|_ {
+        				namespace: context.namespace
+        			}
+        		}
+        		stringData: parameter.data
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the name of the secret
+        	secretName: string
+        	// +usage=Specify the namespace of the secret
+        	namespace?: string
+        	// +usage=Specify the type of the secret
+        	type?: string
+        	// +usage=Specify the data of secret
+        	data: {}
+        }
+

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

@@ -0,0 +1,58 @@
+# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file.
+# Definition source cue file: vela-templates/definitions/internal/read-object.cue
+apiVersion: core.oam.dev/v1beta1
+kind: WorkflowStepDefinition
+metadata:
+  annotations:
+    definition.oam.dev/description: Read objects for your workflow steps
+  name: read-object
+  namespace: {{.Values.systemDefinitionNamespace}}
+spec:
+  schematic:
+    cue:
+      template: |
+        import (
+        	"vela/op"
+        )
+
+        output: {
+        	if parameter.apiVersion == _|_ && parameter.kind == _|_ {
+        		op.#Read & {
+        			value: {
+        				apiVersion: "core.oam.dev/v1beta1"
+        				kind:       "Application"
+        				metadata: {
+        					name: parameter.name
+        					if parameter.namespace != _|_ {
+        						namespace: parameter.namespace
+        					}
+        				}
+        			}
+        		}
+        	}
+        	if parameter.apiVersion != _|_ || parameter.kind != _|_ {
+        		op.#Read & {
+        			value: {
+        				apiVersion: parameter.apiVersion
+        				kind:       parameter.kind
+        				metadata: {
+        					name: parameter.name
+        					if parameter.namespace != _|_ {
+        						namespace: parameter.namespace
+        					}
+        				}
+        			}
+        		}
+        	}
+        }
+        parameter: {
+        	// +usage=Specify the apiVersion of the object, defaults to core.oam.dev/v1beta1
+        	apiVersion?: string
+        	// +usage=Specify the kind of the object, defaults to Application
+        	kind?: string
+        	// +usage=Specify the name of the object
+        	name: string
+        	// +usage=Specify the namespace of the object
+        	namespace?: string
+        }
+

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

@@ -23,6 +23,10 @@ spec:
         				name:  context.name
         				image: parameter.image
 
+        				if parameter["imagePullPolicy"] != _|_ {
+        					imagePullPolicy: parameter.imagePullPolicy
+        				}
+
         				if parameter["cmd"] != _|_ {
         					command: parameter.cmd
         				}
@@ -85,6 +89,13 @@ spec:
         					}}]
         			}
 
+        			if parameter["imagePullSecrets"] != _|_ {
+        				imagePullSecrets: [ for v in parameter.imagePullSecrets {
+        					name: v
+        				},
+        				]
+        			}
+
         		}
         	}
         }
@@ -97,6 +108,12 @@ spec:
         	// +short=i
         	image: string
 
+        	// +usage=Specify image pull policy for your service
+        	imagePullPolicy?: string
+
+        	// +usage=Specify image pull secrets for your service
+        	imagePullSecrets?: [...string]
+
         	// +usage=Define the job restart policy, the value can only be Never or OnFailure. By default, it's Never.
         	restart: *"Never" | string
 

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

@@ -13,11 +13,18 @@ spec:
       template: |
         import (
         	"vela/op"
+        	"encoding/base64"
         )
 
         parameter: {
         	dingding?: {
-        		url: string
+        		url: {
+        			address?: string
+        			fromSecret?: {
+        				name: string
+        				key:  string
+        			}
+        		}
         		message: {
         			text?: *null | {
         				content: string
@@ -62,7 +69,13 @@ spec:
         	}
 
         	slack?: {
-        		url: string
+        		url: {
+        			address?: string
+        			fromSecret?: {
+        				name: string
+        				key:  string
+        			}
+        		}
         		message: {
         			text:         string
         			blocks?:      *null | [...block]
@@ -121,19 +134,61 @@ spec:
         	url?:         string
         }
         // send webhook notification
-        ding: {
+        ding: op.#Steps & {
         	if parameter.dingding != _|_ {
-        		op.#DingTalk & {
-        			message: parameter.dingding.message
-        			dingUrl: parameter.dingding.url
+        		if parameter.dingding.url.address != _|_ {
+        			ding1: op.#DingTalk & {
+        				message: parameter.dingding.message
+        				dingUrl: parameter.dingding.url.address
+        			}
+        		}
+        		if parameter.dingding.url.fromSecret != _|_ && parameter.dingding.url.address == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					apiVersion: "v1"
+        					kind:       "Secret"
+        					metadata: {
+        						name:      parameter.dingding.url.fromSecret.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.fromSecret.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			ding2:       op.#DingTalk & {
+        				message: parameter.dingding.message
+        				dingUrl: stringValue.str
+        			}
         		}
         	}
         }
-        slack: {
+        slack: op.#Steps & {
         	if parameter.slack != _|_ {
-        		op.#Slack & {
-        			message:  parameter.slack.message
-        			slackUrl: parameter.slack.url
+        		if parameter.slack.url.address != _|_ {
+        			slack1: op.#Slack & {
+        				message:  parameter.slack.message
+        				slackUrl: parameter.slack.url.address
+        			}
+        		}
+        		if parameter.slack.url.fromSecret != _|_ && parameter.slack.url.address == _|_ {
+        			read: op.#Read & {
+        				value: {
+        					kind:       "Secret"
+        					apiVersion: "v1"
+        					metadata: {
+        						name:      parameter.slack.url.fromSecret.name
+        						namespace: context.namespace
+        					}
+        				}
+        			}
+
+        			decoded:     base64.Decode(null, read.value.data[parameter.slack.url.fromSecret.key])
+        			stringValue: op.#ConvertString & {bt: decoded}
+        			slack2:      op.#Slack & {
+        				message:  parameter.slack.message
+        				slackUrl: stringValue.str
+        			}
         		}
         	}
         }

charts/vela-minimal/values.yaml

@@ -69,7 +69,7 @@ admissionWebhooks:
     enabled: true
     image:
       repository: oamdev/kube-webhook-certgen
-      tag: v2.2
+      tag: v2.3
       pullPolicy: IfNotPresent
     affinity: {}
     tolerations: []

docs/examples/workflow/export2config/app.yaml

@@ -0,0 +1,28 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: export-config
+  namespace: default
+spec:
+  components:
+  - name: express-server
+    type: webservice
+    properties:
+      image: crccheck/hello-world
+      port: 8000
+  workflow:
+    steps:
+      - name: apply-server
+        type: apply-component
+        outputs: 
+          - name: status
+            valueFrom: output.status.conditions[0].message
+        properties:
+          component: express-server
+      - name: export-config
+        type: export-config
+        inputs:
+          - from: status
+            parameterKey: data.serverstatus
+        properties:
+          configName: my-configmap

docs/examples/workflow/export2secret/app.yaml

@@ -0,0 +1,28 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: export-secret
+  namespace: default
+spec:
+  components:
+  - name: express-server
+    type: webservice
+    properties:
+      image: crccheck/hello-world
+      port: 8000
+  workflow:
+    steps:
+      - name: apply-server
+        type: apply-component
+        outputs: 
+          - name: status
+            valueFrom: output.status.conditions[0].message
+        properties:
+          component: express-server
+      - name: export-secret
+        type: export-secret
+        inputs:
+          - from: status
+            parameterKey: data.serverstatus
+        properties:
+          secretName: my-secret

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

@@ -0,0 +1,34 @@
+apiVersion: core.oam.dev/v1beta1
+kind: Application
+metadata:
+  name: read-object
+  namespace: default
+spec:
+  components:
+  - name: express-server
+    type: webservice
+    properties:
+      image: crccheck/hello-world
+      port: 8000
+  workflow:
+    steps:
+    - name: read-object
+      type: read-object
+      outputs:
+        - name: cpu
+          valueFrom: output.value.data["cpu"]
+        - name: memory
+          valueFrom: output.value.data["memory"]
+      properties:
+        apiVersion: v1
+        kind: ConfigMap
+        name: my-cm-name
+    - name: apply
+      type: apply-component
+      inputs:
+        - from: cpu
+          parameterKey: cpu
+        - from: memory
+          parameterKey: memory
+      properties:
+        component: express-server

e2e/addon/addon_test.go

@@ -38,12 +38,12 @@ var _ = Describe("Addon Test", func() {
 		k8sClient, err := args.GetClient()
 		Expect(err).Should(BeNil())
 		It("Apply test addon", func() {
-			Expect(yaml.Unmarshal([]byte(test_addon), &cmSimpleAddon)).Should(BeNil())
+			Expect(yaml.Unmarshal([]byte(testAddon), &cmSimpleAddon)).Should(BeNil())
 			err = k8sClient.Create(context.Background(), &cmSimpleAddon)
 			Expect(err).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
 		})
 		It("Apply test input addon", func() {
-			Expect(yaml.Unmarshal([]byte(test_input_addon), &cmInputAddon)).Should(BeNil())
+			Expect(yaml.Unmarshal([]byte(testInputAddon), &cmInputAddon)).Should(BeNil())
 			err = k8sClient.Create(context.Background(), &cmInputAddon)
 			Expect(err).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
 		})
@@ -100,7 +100,7 @@ var _ = Describe("Addon Test", func() {
 
 })
 
-var test_addon = `
+var testAddon = `
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -112,33 +112,46 @@ metadata:
   name: test-addon
   namespace: vela-system
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: This is a addon for e2e test
       name: test-addon
-      namespace: test-addon-system
+      namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-            - name: test-addon-pod
-              type: raw
-              properties:
-                apiVersion: v1
-                kind: Pod
-                metadata:
-                  name: test-addon-pod
-                  namespace: test-addon-system
-                spec:
-                  containers:
-                    - name: test-addon-pod-container
-                      image: nginx
+      workflow:
+        steps:
+          - name: apply-ns
+            type: apply-component
+            properties:
+              component: ns-test-addon-system
+          - name: apply-resources
+            type: apply-remaining
+      components:
+        - name: ns-test-addon-system
+          type: raw
+          properties:
+            apiVersion: v1
+            kind: Namespace
+            metadata:
+              name: test-addon-system
+        - name: test-addon-pod
+          type: raw
+          properties:
+            apiVersion: v1
+            kind: Pod
+            metadata:
+              name: test-addon-pod
+            spec:
+              namespace: test-addon-system
+              containers:
+                - name: test-addon-pod-container
+                  image: nginx
 `
 
-var test_input_addon = `
+var testInputAddon = `
 kind: ConfigMap
 metadata:
   annotations:
@@ -150,38 +163,20 @@ metadata:
   namespace: vela-system
 apiVersion: v1
 data:
-  initializer: |
+  application: |
     apiVersion: core.oam.dev/v1beta1
-    kind: Initializer
+    kind: Application
     metadata:
       annotations:
         addons.oam.dev/description: This is a test addon for test addon input
       name: test-input-addon
       namespace: vela-system
     spec:
-      appTemplate:
-        spec:
-          components:
-          - name: test-chart
-            properties:
-              chart: [[ index .Args "chart" ]]
-              repoType: helm
-              url: [[ index .Args "url" ]]
-            type: helm
-        status:
-          rollout:
-            batchRollingState: ""
-            currentBatch: 0
-            lastTargetAppRevision: ""
-            rollingState: ""
-            upgradedReadyReplicas: 0
-            upgradedReplicas: 0
-      dependsOn:
-      - ref:
-          apiVersion: core.oam.dev/v1beta1
-          kind: Initializer
-          name: fluxcd
-          namespace: vela-system
-    status:
-      observedGeneration: 0
+      components:
+      - name: test-chart
+        properties:
+          chart: [[ index .Args "chart" ]]
+          repoType: helm
+          url: [[ index .Args "url" ]]
+        type: helm
 `

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/mitchellh/hashstructure/v2 v2.0.1
 	github.com/oam-dev/cluster-gateway v1.1.2
 	github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28
-	github.com/oam-dev/terraform-controller v0.2.1
+	github.com/oam-dev/terraform-controller v0.2.4
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.16.0

go.sum

@@ -1206,8 +1206,8 @@ github.com/oam-dev/stern v1.13.0-alpha h1:EVjM8Qvh6LssB6t4RZrjf9DtCq1cz+/cy6OF7f
 github.com/oam-dev/stern v1.13.0-alpha/go.mod h1:AOkvfFUv0Arz7GBi0jz7S0Jsu4K/kdvSjNsnRt1+BIg=
 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU=
 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28/go.mod h1:Mu8i0/DdplvnjwRbAYPsc8+LRR27n/mp8VWdkN10GzE=
-github.com/oam-dev/terraform-controller v0.2.1 h1:gGXcUDBMWKfWet84STm99RX6gXo89pyTRsgQSLq2mog=
-github.com/oam-dev/terraform-controller v0.2.1/go.mod h1:5Vy6jLx9fjotEd6E005Ve1f0x3fEpVlG/DVjmqLjAq0=
+github.com/oam-dev/terraform-controller v0.2.4 h1:yGgIzm2EWNghuRutnChrRfhMjdlU/jE/cLfBizCgE24=
+github.com/oam-dev/terraform-controller v0.2.4/go.mod h1:wd4rnqnJzz274Sg1/qoeIhBx1rvTZ/ECzXoMff0ucR0=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=

pkg/oam/labels.go

@@ -122,4 +122,7 @@ const (
 
 	// AnnotationAddonsName records the name of initializer stored in configMap
 	AnnotationAddonsName = "addons.oam.dev/name"
+
+	// AnnotationLastAppliedConfiguration is kubectl annotations for 3-way merge
+	AnnotationLastAppliedConfiguration = "kubectl.kubernetes.io/last-applied-configuration"
 )

pkg/stdlib/op.cue

@@ -134,6 +134,8 @@ import (
 
 #HTTPDelete: http.#Do & {method: "DELETE"}
 
+#ConvertString: convert.#String
+
 #Load: oam.#LoadComponets
 
 #Read: kube.#Read

pkg/stdlib/pkgs/convert.cue

@@ -0,0 +1,8 @@
+#String: {
+	#do:       "string"
+	#provider: "convert"
+
+	bt:   bytes
+	str?: string
+	...
+}

pkg/workflow/providers/convert/string.go

@@ -0,0 +1,53 @@
+/*
+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 convert
+
+import (
+	"github.com/oam-dev/kubevela/pkg/cue/model/value"
+	wfContext "github.com/oam-dev/kubevela/pkg/workflow/context"
+	"github.com/oam-dev/kubevela/pkg/workflow/providers"
+	"github.com/oam-dev/kubevela/pkg/workflow/types"
+)
+
+const (
+	// ProviderName is provider name for install.
+	ProviderName = "convert"
+)
+
+type provider struct {
+}
+
+// String convert byte to string
+func (h *provider) String(ctx wfContext.Context, v *value.Value, act types.Action) error {
+	b, err := v.LookupValue("bt")
+	if err != nil {
+		return err
+	}
+	s, err := b.CueValue().Bytes()
+	if err != nil {
+		return err
+	}
+	return v.FillObject(string(s), "str")
+}
+
+// Install register handlers to provider discover.
+func Install(p providers.Providers) {
+	prd := &provider{}
+	p.Register(ProviderName, map[string]providers.Handler{
+		"string": prd.String,
+	})
+}

pkg/workflow/providers/convert/string_test.go

@@ -0,0 +1,74 @@
+/*
+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 convert
+
+import (
+	"errors"
+	"testing"
+
+	"gotest.tools/assert"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/oam-dev/kubevela/pkg/cue/model/value"
+	"github.com/oam-dev/kubevela/pkg/workflow/providers"
+)
+
+func TestConvertString(t *testing.T) {
+	testCases := map[string]struct {
+		from        string
+		expected    string
+		expectedErr error
+	}{
+		"success": {
+			from:     `bt: 'test'`,
+			expected: "test",
+		},
+		"fail": {
+			from:        `bt: 123`,
+			expectedErr: errors.New("bt: cannot use value 123 (type int) as string|bytes"),
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			r := require.New(t)
+			v, err := value.NewValue(tc.from, nil, "")
+			r.NoError(err)
+			prd := &provider{}
+			err = prd.String(nil, v, nil)
+			if tc.expectedErr != nil {
+				r.Equal(tc.expectedErr.Error(), err.Error())
+				return
+			}
+			r.NoError(err)
+			expected, err := v.LookupValue("str")
+			r.NoError(err)
+			ret, err := expected.CueValue().String()
+			r.NoError(err)
+			r.Equal(ret, tc.expected)
+		})
+	}
+}
+
+func TestInstall(t *testing.T) {
+	p := providers.NewProviders()
+	Install(p)
+	h, ok := p.GetHandler("convert", "string")
+	assert.Equal(t, ok, true)
+	assert.Equal(t, h != nil, true)
+}

pkg/workflow/tasks/discover.go

@@ -28,6 +28,7 @@ import (
 	"github.com/oam-dev/kubevela/pkg/oam/discoverymapper"
 	wfContext "github.com/oam-dev/kubevela/pkg/workflow/context"
 	"github.com/oam-dev/kubevela/pkg/workflow/providers"
+	"github.com/oam-dev/kubevela/pkg/workflow/providers/convert"
 	"github.com/oam-dev/kubevela/pkg/workflow/providers/http"
 	"github.com/oam-dev/kubevela/pkg/workflow/providers/workspace"
 	"github.com/oam-dev/kubevela/pkg/workflow/tasks/custom"
@@ -72,6 +73,7 @@ func NewTaskDiscover(providerHandlers providers.Providers, pd *packages.PackageD
 	// install builtin provider
 	workspace.Install(providerHandlers)
 	http.Install(providerHandlers)
+	convert.Install(providerHandlers)
 	templateLoader := template.NewTemplateLoader(cli, dm)
 	return &taskDiscover{
 		builtins: map[string]types.TaskGenerator{

references/cli/addon.go

@@ -24,12 +24,13 @@ import (
 	"text/template"
 	"time"
 
+	common2 "github.com/oam-dev/kubevela/apis/core.oam.dev/common"
+
 	"github.com/Masterminds/sprig"
 	"github.com/gosuri/uitable"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	v1 "k8s.io/api/core/v1"
-	errors2 "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -59,9 +60,26 @@ var statusInstalled = "installed"
 var clt client.Client
 var clientArgs common.Args
 
+var legacyAddonNamespace map[string]string
+
 func init() {
 	clientArgs, _ = common.InitBaseRestConfig()
 	clt, _ = clientArgs.GetClient()
+	legacyAddonNamespace = map[string]string{
+		"fluxcd":                     types.DefaultKubeVelaNS,
+		"ns-flux-system":             types.DefaultKubeVelaNS,
+		"kruise":                     types.DefaultKubeVelaNS,
+		"prometheus":                 types.DefaultKubeVelaNS,
+		"observability":              "observability",
+		"observability-asset":        types.DefaultKubeVelaNS,
+		"istio":                      "istio-system",
+		"ns-istio-system":            types.DefaultKubeVelaNS,
+		"keda":                       types.DefaultKubeVelaNS,
+		"ocm-cluster-manager":        types.DefaultKubeVelaNS,
+		"terraform":                  types.DefaultKubeVelaNS,
+		"terraform-provider/alibaba": "default",
+		"terraform-provider/azure":   "default",
+	}
 }
 
 // NewAddonCommand create `addon` command
@@ -85,9 +103,10 @@ func NewAddonCommand(c common.Args, ioStreams cmdutil.IOStreams) *cobra.Command
 // NewAddonListCommand create addon list command
 func NewAddonListCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:   "list",
-		Short: "List addons",
-		Long:  "List addons in KubeVela",
+		Use:     "list",
+		Aliases: []string{"ls"},
+		Short:   "List addons",
+		Long:    "List addons in KubeVela",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := listAddons()
 			if err != nil {
@@ -118,6 +137,7 @@ func NewAddonEnableCommand(ioStream cmdutil.IOStreams) *cobra.Command {
 			if err != nil {
 				return err
 			}
+			fmt.Printf("Successfully enable addon:%s\n", name)
 			return nil
 		},
 	}
@@ -155,6 +175,7 @@ func NewAddonDisableCommand(ioStream cmdutil.IOStreams) *cobra.Command {
 			if err != nil {
 				return err
 			}
+			fmt.Printf("Successfully disable addon:%s\n", name)
 			return nil
 		},
 	}
@@ -167,9 +188,9 @@ func listAddons() error {
 	}
 	addons := repo.listAddons()
 	table := uitable.New()
-	table.AddRow("NAME", "DESCRIPTION", "STATUS", "IN-NAMESPACE")
+	table.AddRow("NAME", "DESCRIPTION", "STATUS")
 	for _, addon := range addons {
-		table.AddRow(addon.name, addon.description, addon.getStatus(), addon.addonNamespace)
+		table.AddRow(addon.name, addon.description, addon.getStatus())
 	}
 	fmt.Println(table.String())
 	return nil
@@ -186,38 +207,65 @@ func enableAddon(name string, args map[string]string) error {
 	}
 	addon.setArgs(args)
 	err = addon.enable()
-	if err != nil {
-		return err
-	}
-	fmt.Printf("Successfully enable addon:%s\n", addon.name)
-	return nil
+	return err
 }
 
 func disableAddon(name string) error {
+	if isLegacyAddonExist(name) {
+		return tryDisableInitializerAddon(name)
+	}
 	repo, err := NewAddonRepo()
 	if err != nil {
 		return err
 	}
 	addon, err := repo.getAddon(name)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "get addon err")
 	}
 	if addon.getStatus() == statusUninstalled {
 		fmt.Printf("Addon %s is not installed\n", addon.name)
 		return nil
 	}
-	err = addon.disable()
-	if err != nil {
-		return err
+	return addon.disable()
+
+}
+
+func isLegacyAddonExist(name string) bool {
+	if namespace, ok := legacyAddonNamespace[name]; ok {
+		convertedAddonName := TransAddonName(name)
+		init := unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "core.oam.dev/v1beta1",
+				"kind":       "Initializer",
+			},
+		}
+		err := clt.Get(context.TODO(), client.ObjectKey{
+			Namespace: namespace,
+			Name:      convertedAddonName,
+		}, &init)
+		return err == nil
 	}
-	fmt.Printf("Successfully disable addon:%s\n", addon.name)
-	return nil
+	return false
+}
+
+func tryDisableInitializerAddon(addonName string) error {
+	fmt.Printf("Trying to disable addon in initializer implementation...\n")
+	init := unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "core.oam.dev/v1beta1",
+			"kind":       "Initializer",
+			"metadata": map[string]interface{}{
+				"name":      TransAddonName(addonName),
+				"namespace": legacyAddonNamespace[addonName],
+			},
+		},
+	}
+	return clt.Delete(context.TODO(), &init)
+
 }
 func newAddon(data *v1.ConfigMap) *Addon {
 	description := data.ObjectMeta.Annotations[DescAnnotation]
-	a := Addon{name: data.Annotations[oam.AnnotationAddonsName], description: description, initYaml: data.Data["initializer"]}
-	init, _ := a.renderInitializer()
-	a.addonNamespace = init.GetNamespace()
+	a := Addon{name: data.Annotations[oam.AnnotationAddonsName], description: description, data: data.Data["application"]}
 	return &a
 }
 
@@ -251,13 +299,22 @@ type configMapAddonRepo struct {
 	maps []v1.ConfigMap
 }
 
+// AddonNotFoundErr means addon not found
+type AddonNotFoundErr struct {
+	addonName string
+}
+
+func (e AddonNotFoundErr) Error() string {
+	return fmt.Sprintf("addon %s not found", e.addonName)
+}
+
 func (c configMapAddonRepo) getAddon(name string) (Addon, error) {
 	for i := range c.maps {
 		if addonName, ok := c.maps[i].Annotations[oam.AnnotationAddonsName]; ok && name == addonName {
 			return *newAddon(&c.maps[i]), nil
 		}
 	}
-	return Addon{}, fmt.Errorf("addon: %s not found", name)
+	return Addon{}, AddonNotFoundErr{addonName: name}
 }
 
 func (c configMapAddonRepo) listAddons() []Addon {
@@ -271,42 +328,41 @@ func (c configMapAddonRepo) listAddons() []Addon {
 
 // Addon consist of a Initializer resource to enable an addon
 type Addon struct {
-	name           string
-	addonNamespace string // addonNamespace is where Initializer will be apply
-	description    string
-	initYaml       string
+	name        string
+	description string
+	data        string
 	// Args is map for renderInitializer
 	Args        map[string]string
-	initializer *unstructured.Unstructured
+	application *unstructured.Unstructured
 	gvk         *schema.GroupVersionKind
 }
 
 func (a *Addon) getGVK() (*schema.GroupVersionKind, error) {
 	if a.gvk == nil {
-		if a.initializer == nil {
-			_, err := a.renderInitializer()
+		if a.application == nil {
+			_, err := a.renderApplication()
 			if err != nil {
 				return nil, err
 			}
 		}
-		gvk := schema.FromAPIVersionAndKind(a.initializer.GetAPIVersion(), a.initializer.GetKind())
+		gvk := schema.FromAPIVersionAndKind(a.application.GetAPIVersion(), a.application.GetKind())
 		a.gvk = &gvk
 	}
 	return a.gvk, nil
 }
 
-func (a *Addon) renderInitializer() (*unstructured.Unstructured, error) {
+func (a *Addon) renderApplication() (*unstructured.Unstructured, error) {
 	if a.Args == nil {
 		a.Args = map[string]string{}
 	}
-	t, err := template.New("addon-template").Delims("[[", "]]").Funcs(sprig.TxtFuncMap()).Parse(a.initYaml)
+	t, err := template.New("addon-template").Delims("[[", "]]").Funcs(sprig.TxtFuncMap()).Parse(a.data)
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing addon initializer template error")
 	}
 	buf := bytes.Buffer{}
 	err = t.Execute(&buf, a)
 	if err != nil {
-		return nil, errors.Wrap(err, "initializer template render fail")
+		return nil, errors.Wrap(err, "application template render fail")
 	}
 	dec := yaml.NewDecodingSerializer(unstructured.UnstructuredJSONScheme)
 	obj := &unstructured.Unstructured{}
@@ -314,57 +370,44 @@ func (a *Addon) renderInitializer() (*unstructured.Unstructured, error) {
 	if err != nil {
 		return nil, err
 	}
-	a.initializer = obj
+	a.application = obj
 	a.gvk = gvk
-	return a.initializer, nil
+	return a.application, nil
 }
 
 func (a *Addon) enable() error {
 	applicator := apply.NewAPIApplicator(clt)
 	ctx := context.Background()
-	obj, err := a.renderInitializer()
+	obj, err := a.renderApplication()
 	if err != nil {
 		return err
 	}
-	var ns v1.Namespace
-	err = clt.Get(ctx, types2.NamespacedName{Name: obj.GetNamespace()}, &ns)
-	if err != nil && errors2.IsNotFound(err) {
-		fmt.Printf("Creating namespace: %s\n", obj.GetNamespace())
-		err = clt.Create(ctx, &v1.Namespace{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: obj.GetNamespace(),
-			},
-		})
-	}
-	if err != nil {
-		return errors.Wrap(err, "Create namespace error")
-	}
 	err = applicator.Apply(ctx, obj)
 	if err != nil {
-		return errors.Wrapf(err, "Error occurs when enableing addon: %s\n", a.name)
+		return errors.Wrapf(err, "Error occurs when apply addon application: %s\n", a.name)
 	}
-	err = waitForInitializerSuccess(obj)
+	err = waitApplicationRunning(a.application)
 	if err != nil {
-		return errors.Wrapf(err, "Error occurs when waiting for addon enabled: %s\n", a.name)
+		return errors.Wrap(err, "Error occurs when waiting addon applicatoin running")
 	}
 	return nil
 }
 
-func waitForInitializerSuccess(obj *unstructured.Unstructured) error {
+func waitApplicationRunning(obj *unstructured.Unstructured) error {
 	ctx := context.Background()
 	period := 20 * time.Second
 	timeout := 10 * time.Minute
-	var init v1beta1.Initializer
+	var app v1beta1.Application
 	return wait.PollImmediate(period, timeout, func() (done bool, err error) {
-		err = clt.Get(ctx, types2.NamespacedName{Name: obj.GetName(), Namespace: obj.GetNamespace()}, &init)
+		err = clt.Get(ctx, types2.NamespacedName{Name: obj.GetName(), Namespace: obj.GetNamespace()}, &app)
 		if err != nil {
 			return false, client.IgnoreNotFound(err)
 		}
-		phase := init.Status.Phase
-		if phase == v1beta1.InitializerSuccess {
+		phase := app.Status.Phase
+		if phase == common2.ApplicationRunning {
 			return true, nil
 		}
-		fmt.Printf("Initializer %s is in phase:%s...\n", obj.GetName(), phase)
+		fmt.Printf("Application %s is in phase:%s...\n", obj.GetName(), phase)
 		return false, nil
 	})
 }
@@ -377,7 +420,7 @@ func (a *Addon) disable() error {
 	if err != nil {
 		return err
 	}
-	obj, err := a.renderInitializer()
+	obj, err := a.renderApplication()
 	if err != nil {
 		return err
 	}
@@ -410,11 +453,11 @@ func (a *Addon) disable() error {
 }
 
 func (a *Addon) getStatus() string {
-	var initializer v1beta1.Initializer
+	var application v1beta1.Application
 	err := clt.Get(context.Background(), client.ObjectKey{
-		Namespace: a.addonNamespace,
+		Namespace: types.DefaultKubeVelaNS,
 		Name:      TransAddonName(a.name),
-	}, &initializer)
+	}, &application)
 	if err != nil {
 		return statusUninstalled
 	}

references/cli/workflow.go

@@ -51,7 +51,7 @@ func NewWorkflowCommand(c common.Args, ioStreams cmdutil.IOStreams) *cobra.Comma
 
 // NewWorkflowSuspendCommand create workflow suspend command
 func NewWorkflowSuspendCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:     "suspend",
 		Short:   "Suspend an application workflow",
 		Long:    "Suspend an application workflow in cluster",
@@ -60,11 +60,18 @@ func NewWorkflowSuspendCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra
 			if len(args) < 1 {
 				return fmt.Errorf("must specify application name")
 			}
-			env, err := GetFlagEnvOrCurrent(cmd, c)
+			namespace, err := cmd.Flags().GetString(FlagNamespace)
 			if err != nil {
 				return err
 			}
-			app, err := appfile.LoadApplication(env.Namespace, args[0], c)
+			if namespace == "" {
+				env, err := GetFlagEnvOrCurrent(cmd, c)
+				if err != nil {
+					return err
+				}
+				namespace = env.Namespace
+			}
+			app, err := appfile.LoadApplication(namespace, args[0], c)
 			if err != nil {
 				return err
 			}
@@ -86,11 +93,13 @@ func NewWorkflowSuspendCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra
 			return nil
 		},
 	}
+	cmd.Flags().StringP(FlagNamespace, "n", "", "Specify which namespace to get. If empty, uses namespace in env.")
+	return cmd
 }
 
 // NewWorkflowResumeCommand create workflow resume command
 func NewWorkflowResumeCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:     "resume",
 		Short:   "Resume a suspend application workflow",
 		Long:    "Resume a suspend application workflow in cluster",
@@ -99,11 +108,18 @@ func NewWorkflowResumeCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.
 			if len(args) < 1 {
 				return fmt.Errorf("must specify application name")
 			}
-			env, err := GetFlagEnvOrCurrent(cmd, c)
+			namespace, err := cmd.Flags().GetString(FlagNamespace)
 			if err != nil {
 				return err
 			}
-			app, err := appfile.LoadApplication(env.Namespace, args[0], c)
+			if namespace == "" {
+				env, err := GetFlagEnvOrCurrent(cmd, c)
+				if err != nil {
+					return err
+				}
+				namespace = env.Namespace
+			}
+			app, err := appfile.LoadApplication(namespace, args[0], c)
 			if err != nil {
 				return err
 			}
@@ -135,11 +151,13 @@ func NewWorkflowResumeCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.
 			return nil
 		},
 	}
+	cmd.Flags().StringP(FlagNamespace, "n", "", "Specify which namespace to get. If empty, uses namespace in env.")
+	return cmd
 }
 
 // NewWorkflowTerminateCommand create workflow terminate command
 func NewWorkflowTerminateCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:     "terminate",
 		Short:   "Terminate an application workflow",
 		Long:    "Terminate an application workflow in cluster",
@@ -148,11 +166,18 @@ func NewWorkflowTerminateCommand(c common.Args, ioStream cmdutil.IOStreams) *cob
 			if len(args) < 1 {
 				return fmt.Errorf("must specify application name")
 			}
-			env, err := GetFlagEnvOrCurrent(cmd, c)
+			namespace, err := cmd.Flags().GetString(FlagNamespace)
 			if err != nil {
 				return err
 			}
-			app, err := appfile.LoadApplication(env.Namespace, args[0], c)
+			if namespace == "" {
+				env, err := GetFlagEnvOrCurrent(cmd, c)
+				if err != nil {
+					return err
+				}
+				namespace = env.Namespace
+			}
+			app, err := appfile.LoadApplication(namespace, args[0], c)
 			if err != nil {
 				return err
 			}
@@ -174,11 +199,13 @@ func NewWorkflowTerminateCommand(c common.Args, ioStream cmdutil.IOStreams) *cob
 			return nil
 		},
 	}
+	cmd.Flags().StringP(FlagNamespace, "n", "", "Specify which namespace to get. If empty, uses namespace in env.")
+	return cmd
 }
 
 // NewWorkflowRestartCommand create workflow restart command
 func NewWorkflowRestartCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:     "restart",
 		Short:   "Restart an application workflow",
 		Long:    "Restart an application workflow in cluster",
@@ -187,11 +214,18 @@ func NewWorkflowRestartCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra
 			if len(args) < 1 {
 				return fmt.Errorf("must specify application name")
 			}
-			env, err := GetFlagEnvOrCurrent(cmd, c)
+			namespace, err := cmd.Flags().GetString(FlagNamespace)
 			if err != nil {
 				return err
 			}
-			app, err := appfile.LoadApplication(env.Namespace, args[0], c)
+			if namespace == "" {
+				env, err := GetFlagEnvOrCurrent(cmd, c)
+				if err != nil {
+					return err
+				}
+				namespace = env.Namespace
+			}
+			app, err := appfile.LoadApplication(namespace, args[0], c)
 			if err != nil {
 				return err
 			}
@@ -213,6 +247,8 @@ func NewWorkflowRestartCommand(c common.Args, ioStream cmdutil.IOStreams) *cobra
 			return nil
 		},
 	}
+	cmd.Flags().StringP(FlagNamespace, "n", "", "Specify which namespace to get. If empty, uses namespace in env.")
+	return cmd
 }
 
 func suspendWorkflow(kubecli client.Client, app *v1beta1.Application) error {

references/cli/workflow_test.go

@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -83,7 +84,7 @@ func TestWorkflowSuspend(t *testing.T) {
 			app: &v1beta1.Application{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "workflow",
-					Namespace: "default",
+					Namespace: "test",
 				},
 				Spec: workflowSpec,
 				Status: common.AppStatus{
@@ -105,7 +106,17 @@ func TestWorkflowSuspend(t *testing.T) {
 				err := c.Client.Create(ctx, tc.app)
 				r.NoError(err)
 
-				cmd.SetArgs([]string{tc.app.Name})
+				if tc.app.Namespace != corev1.NamespaceDefault {
+					err := c.Client.Create(ctx, &corev1.Namespace{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: tc.app.Namespace,
+						},
+					})
+					r.NoError(err)
+					cmd.SetArgs([]string{tc.app.Name, "-n", tc.app.Namespace})
+				} else {
+					cmd.SetArgs([]string{tc.app.Name})
+				}
 			}
 			err := cmd.Execute()
 			if tc.expectedErr != nil {
@@ -190,7 +201,7 @@ func TestWorkflowResume(t *testing.T) {
 			app: &v1beta1.Application{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "workflow",
-					Namespace: "default",
+					Namespace: "test",
 				},
 				Spec: workflowSpec,
 				Status: common.AppStatus{
@@ -212,7 +223,17 @@ func TestWorkflowResume(t *testing.T) {
 				err := c.Client.Create(ctx, tc.app)
 				r.NoError(err)
 
-				cmd.SetArgs([]string{tc.app.Name})
+				if tc.app.Namespace != corev1.NamespaceDefault {
+					err := c.Client.Create(ctx, &corev1.Namespace{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: tc.app.Namespace,
+						},
+					})
+					r.NoError(err)
+					cmd.SetArgs([]string{tc.app.Name, "-n", tc.app.Namespace})
+				} else {
+					cmd.SetArgs([]string{tc.app.Name})
+				}
 			}
 			err := cmd.Execute()
 			if tc.expectedErr != nil {
@@ -268,7 +289,7 @@ func TestWorkflowTerminate(t *testing.T) {
 			app: &v1beta1.Application{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "workflow",
-					Namespace: "default",
+					Namespace: "test",
 				},
 				Spec: workflowSpec,
 				Status: common.AppStatus{
@@ -290,7 +311,17 @@ func TestWorkflowTerminate(t *testing.T) {
 				err := c.Client.Create(ctx, tc.app)
 				r.NoError(err)
 
-				cmd.SetArgs([]string{tc.app.Name})
+				if tc.app.Namespace != corev1.NamespaceDefault {
+					err := c.Client.Create(ctx, &corev1.Namespace{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: tc.app.Namespace,
+						},
+					})
+					r.NoError(err)
+					cmd.SetArgs([]string{tc.app.Name, "-n", tc.app.Namespace})
+				} else {
+					cmd.SetArgs([]string{tc.app.Name})
+				}
 			}
 			err := cmd.Execute()
 			if tc.expectedErr != nil {
@@ -346,7 +377,7 @@ func TestWorkflowRestart(t *testing.T) {
 			app: &v1beta1.Application{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "workflow",
-					Namespace: "default",
+					Namespace: "test",
 				},
 				Spec: workflowSpec,
 				Status: common.AppStatus{
@@ -368,7 +399,17 @@ func TestWorkflowRestart(t *testing.T) {
 				err := c.Client.Create(ctx, tc.app)
 				r.NoError(err)
 
-				cmd.SetArgs([]string{tc.app.Name})
+				if tc.app.Namespace != corev1.NamespaceDefault {
+					err := c.Client.Create(ctx, &corev1.Namespace{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: tc.app.Namespace,
+						},
+					})
+					r.NoError(err)
+					cmd.SetArgs([]string{tc.app.Name, "-n", tc.app.Namespace})
+				} else {
+					cmd.SetArgs([]string{tc.app.Name})
+				}
 			}
 			err := cmd.Execute()
 			if tc.expectedErr != nil {

vela-templates/addons/auto-gen/istio.yaml

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

vela-templates/addons/auto-gen/keda.yaml

@@ -1,33 +1,32 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: KEDA is a Kubernetes-based Event Driven Autoscaler.
   name: keda
   namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: keda
-        properties:
-          chart: keda
-          repoType: helm
-          url: https://kedacore.github.io/charts
-        type: helm
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-  dependsOn:
-  - ref:
-      apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: fluxcd
-      namespace: vela-system
+  components:
+  - name: keda
+    properties:
+      chart: keda
+      repoType: helm
+      url: https://kedacore.github.io/charts
+    type: helm
+  workflow:
+    steps:
+    - name: checking-depends-on
+      properties:
+        name: fluxcd
+        namespace: vela-system
+      type: depends-on-app
+    - name: apply-resources
+      type: apply-application
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/kruise.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Kruise is a Kubernetes extended suite for application
@@ -7,179 +7,170 @@ metadata:
   name: kruise
   namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: kruise
-        properties:
-          chart: ./charts/kruise/v0.9.0
-          git:
-            branch: master
-          repoType: git
-          url: https://github.com/openkruise/kruise
-          values:
-            featureGates: PreDownloadImageForInPlaceUpdate=true
-        type: helm
-      - name: cloneset
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Describes long-running, scalable, containerized
-                services that have a stable network endpoint to receive external network
-                traffic from customers. If workload type is skipped for any service
-                defined in Appfile, it will be defaulted to `webservice` type.
-            name: cloneset
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
-                  \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
-                  context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
-                  context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels:
-                  {\n\t\t\t\t\"app.oam.dev/component\": context.name\n\t\t\t}\n\n\t\t\tspec:
-                  {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:  context.name\n\t\t\t\t\timage:
-                  parameter.image\n\n\t\t\t\t\tif parameter.cmd != _|_ {\n\t\t\t\t\t\tcommand:
-                  parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.args != _|_ {\n\t\t\t\t\t\targs:
-                  parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif parameter.env != _|_ {\n\t\t\t\t\t\tenv:
-                  parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif context.config != _|_
-                  {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
-                  parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
-                  parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"]
-                  != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
-                  cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
-                  != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:
-                  \  parameter.memory\n\t\t\t\t\t\t\trequests: memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
-                  parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe:
-                  parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif parameter[\"readinessProbe\"]
-                  != _|_ {\n\t\t\t\t\t\treadinessProbe: parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle:
-                  {\n\t\t\t\t\t\tif parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart:
-                  exec: command: parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif
-                  parameter.preStop != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command:
-                  parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
-                  parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
-                  parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
-                  [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
-                  parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
-                  parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter:
-                  {\n\t// +usage=Which image would you like to use for your service\n\t//
-                  +short=i\n\timage: string\n\n\t// +usage=Specify image pull policy
-                  for your service\n\timagePullPolicy?: string\n\n\t// +usage=Specify
-                  image pull secrets for your service\n\timagePullSecrets?: [...string]\n\n\t//
-                  +usage=Number of CPU units for the service, like `0.5` (0.5 CPU
-                  core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify the
-                  amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
-                  +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
-                  +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
-                  commands will be called immediately after a container is created.\n\tpostStart?:
-                  [...string]\n\n\t// +usage=PreStop is called immediately before
-                  a container is terminated due to an API request or management event
-                  such as liveness/startup probe failure, preemption, resource contention,
-                  etc. The handler is not called if the container crashes or exits.
-                  The reason for termination is passed to the handler. The Pod's termination
-                  grace period countdown begins before the PreStop hooked is executed.
-                  Regardless of the outcome of the handler, the container will eventually
-                  terminate within the Pod's termination grace period. Other management
-                  of the container blocks until the hook completes or until the termination
-                  grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
-                  [...string]\n\n\t// +usage=Which port do you want customer traffic
-                  sent to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define
-                  arguments by using environment variables\n\tenv?: [...#ENV]\n\n\t//
-                  +usage=Cloneset updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
-                  string\n\n\t// +usage=HostAliases is a list of hosts and IPs that
-                  will be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
-                  [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for
-                  assessing whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
-                  +usage=Instructions for assessing whether the container is in a
-                  suitable state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
-                  {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
-                  value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
-                  a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
-                  +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
-                  {\n\t\t\t// +usage=The name of the secret in the pod's namespace
-                  to select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the
-                  secret to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
-                  {\n\n\t// +usage=Instructions for assessing container health by
-                  executing a command. Either this attribute or the httpGet attribute
-                  or the tcpSocket attribute MUST be specified. This attribute is
-                  mutually exclusive with both the httpGet attribute and the tcpSocket
-                  attribute.\n\texec?: {\n\t\t// +usage=A command to be executed inside
-                  the container to assess its health. Each space delimited token of
-                  the command is a separate array element. Commands exiting 0 are
-                  considered to be successful probes, whilst all other exit codes
-                  are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
-                  +usage=Instructions for assessing container health by executing
-                  an HTTP GET request. Either this attribute or the exec attribute
-                  or the tcpSocket attribute MUST be specified. This attribute is
-                  mutually exclusive with both the exec attribute and the tcpSocket
-                  attribute.\n\thttpGet?: {\n\t\t// +usage=The endpoint, relative
-                  to the port, to which the HTTP GET request should be directed.\n\t\tpath:
-                  string\n\t\t// +usage=The TCP socket within the container to which
-                  the HTTP GET request should be directed.\n\t\tport: int\n\t\thttpHeaders?:
-                  [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
-                  +usage=Instructions for assessing container health by probing a
-                  TCP socket. Either this attribute or the exec attribute or the httpGet
-                  attribute MUST be specified. This attribute is mutually exclusive
-                  with both the exec attribute and the httpGet attribute.\n\ttcpSocket?:
-                  {\n\t\t// +usage=The TCP socket within the container that should
-                  be probed to assess container health.\n\t\tport: int\n\t}\n\n\t//
-                  +usage=Number of seconds after the container is started before the
-                  first probe is initiated.\n\tinitialDelaySeconds: *0 | int\n\n\t//
-                  +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
-                  *10 | int\n\n\t// +usage=Number of seconds after which the probe
-                  times out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
-                  successes for the probe to be considered successful after having
-                  failed.\n\tsuccessThreshold: *1 | int\n\n\t// +usage=Number of consecutive
-                  failures required to determine the container is not alive (liveness
-                  probe) or not ready (readiness probe).\n\tfailureThreshold: *3 |
-                  int\n} \n"
-            workload:
-              definition:
-                apiVersion: apps.kruise.io/v1alpha1
-                kind: CloneSet
-        type: raw
-      - name: predownloadimage
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: WorkflowStepDefinition
-          metadata:
-            name: predownloadimage
-          spec:
-            schematic:
-              cue:
-                template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
-                  int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
-                  *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
-                  int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
-                  op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
-                  \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
-                  \   }\n    spec: {\n      image: parameter.image\n      parallelism:
-                  parameter.parallel\n      selector: matchLabels: parameter.kvs\n
-                  \     completionPolicy: {\n        type: parameter.type\n        activeDeadlineSeconds:
-                  parameter.activeDeadlineSeconds\n        ttlSecondsAfterFinished:
-                  parameter.ttlSecondsAfterFinished\n      }\n      pullPolicy: {\n
-                  \       if parameter.backoffLimit != _|_ {\n          backoffLimit:
-                  parameter.backoffLimit\n        }\n        if parameter.timeoutSeconds
-                  != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n        }\n
-                  \     }\n      pullSecrets: parameter.arr\n    }            \n  }
-                  \         \n} \n"
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-  dependsOn:
-  - ref:
+  components:
+  - name: kruise
+    properties:
+      chart: ./charts/kruise/v0.9.0
+      git:
+        branch: master
+      repoType: git
+      url: https://github.com/openkruise/kruise
+      values:
+        featureGates: PreDownloadImageForInPlaceUpdate=true
+    type: helm
+  - name: cloneset
+    properties:
       apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: fluxcd
-      namespace: vela-system
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Describes long-running, scalable, containerized
+            services that have a stable network endpoint to receive external network
+            traffic from customers. If workload type is skipped for any service defined
+            in Appfile, it will be defaulted to `webservice` type.
+        name: cloneset
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "output: {\n\tapiVersion: \"apps.kruise.io/v1alpha1\"\n\tkind:
+              \      \"CloneSet\"\n\tmetadata: labels: {\n\t\t\"app.oam.dev/component\":
+              context.name\n\t}\n\tspec: {\n\t\tselector: matchLabels: {\n\t\t\t\"app.oam.dev/component\":
+              context.name\n\t\t}\n\n\t\ttemplate: {\n\t\t\tmetadata: labels: {\n\t\t\t\t\"app.oam.dev/component\":
+              context.name\n\t\t\t}\n\n\t\t\tspec: {\n\t\t\t\tcontainers: [{\n\t\t\t\t\tname:
+              \ context.name\n\t\t\t\t\timage: parameter.image\n\n\t\t\t\t\tif parameter.cmd
+              != _|_ {\n\t\t\t\t\t\tcommand: parameter.cmd\n\t\t\t\t\t}\n\t\t\t\t\tif
+              parameter.args != _|_ {\n\t\t\t\t\t\targs: parameter.args\n\t\t\t\t\t}\n\t\t\t\t\tif
+              parameter.env != _|_ {\n\t\t\t\t\t\tenv: parameter.env\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              context.config != _|_ {\n\t\t\t\t\t\tenv: context.config\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"imagePullPolicy\"] != _|_ {\n\t\t\t\t\t\timagePullPolicy:
+              parameter.imagePullPolicy\n\t\t\t\t\t}\n\n\t\t\t\t\tports: [{\n\t\t\t\t\t\tcontainerPort:
+              parameter.port\n\t\t\t\t\t}]\n\n\t\t\t\t\tif parameter[\"cpu\"] != _|_
+              {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: cpu:   parameter.cpu\n\t\t\t\t\t\t\trequests:
+              cpu: parameter.cpu\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\tif parameter[\"memory\"]
+              != _|_ {\n\t\t\t\t\t\tresources: {\n\t\t\t\t\t\t\tlimits: memory:   parameter.memory\n\t\t\t\t\t\t\trequests:
+              memory: parameter.memory\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"livenessProbe\"] != _|_ {\n\t\t\t\t\t\tlivenessProbe: parameter.livenessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tif
+              parameter[\"readinessProbe\"] != _|_ {\n\t\t\t\t\t\treadinessProbe:
+              parameter.readinessProbe\n\t\t\t\t\t}\n\n\t\t\t\t\tlifecycle: {\n\t\t\t\t\t\tif
+              parameter.postStart != _|_ {\n\t\t\t\t\t\t\tpostStart: exec: command:
+              parameter.postStart\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif parameter.preStop
+              != _|_ {\n\t\t\t\t\t\t\tpreStop: exec: command: parameter.preStop\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}]\n\t\t\t\tif
+              parameter.hostAliases != _|_ {\n\t\t\t\t\thostAliases: parameter.hostAliases\n\t\t\t\t}\n\t\t\t\tif
+              parameter[\"imagePullSecrets\"] != _|_ {\n\t\t\t\t\timagePullSecrets:
+              [ for v in parameter.imagePullSecrets {name: v}]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tif
+              parameter.updateStrategyType != _|_ {\n\t\t\tupdateStrategy: {\n\t\t\t\ttype:
+              parameter.updateStrategyType\n\t\t\t}\n\t\t}\n\t}\n}\nparameter: {\n\t//
+              +usage=Which image would you like to use for your service\n\t// +short=i\n\timage:
+              string\n\n\t// +usage=Specify image pull policy for your service\n\timagePullPolicy?:
+              string\n\n\t// +usage=Specify image pull secrets for your service\n\timagePullSecrets?:
+              [...string]\n\n\t// +usage=Number of CPU units for the service, like
+              `0.5` (0.5 CPU core), `1` (1 CPU core)\n\tcpu?: string\n\n\t// +usage=Specify
+              the amount of memory to limit\n\tmemory?: *\"2048Mi\" | =~\"^([1-9][0-9]{0,63})(E|P|T|G|M|K|Ei|Pi|Ti|Gi|Mi|Ki)$\"\n\n\t//
+              +usage=Commands to run in the container\n\tcmd?: [...string]\n\n\t//
+              +usage=Arguments to the command.\n\targs?: [...string]\n\n\t// +usage=postStart
+              commands will be called immediately after a container is created.\n\tpostStart?:
+              [...string]\n\n\t// +usage=PreStop is called immediately before a container
+              is terminated due to an API request or management event such as liveness/startup
+              probe failure, preemption, resource contention, etc. The handler is
+              not called if the container crashes or exits. The reason for termination
+              is passed to the handler. The Pod's termination grace period countdown
+              begins before the PreStop hooked is executed. Regardless of the outcome
+              of the handler, the container will eventually terminate within the Pod's
+              termination grace period. Other management of the container blocks until
+              the hook completes or until the termination grace period is reached.
+              More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks\n\tpreStop?:
+              [...string]\n\n\t// +usage=Which port do you want customer traffic sent
+              to\n\t// +short=p\n\tport: *80 | int\n\n\t// +usage=Define arguments
+              by using environment variables\n\tenv?: [...#ENV]\n\n\t// +usage=Cloneset
+              updateStrategy, candidates are `ReCreate`/`InPlaceIfPossible`/`InPlaceOnly`\n\tupdateStrategyType?:
+              string\n\n\t// +usage=HostAliases is a list of hosts and IPs that will
+              be write into the pod's hosts file\n\thostAliases?: [...{\n\t\thostnames:
+              [...string]\n\t\tip: string\n\t}]\n\n\t// +usage=Instructions for assessing
+              whether the container is alive.\n\tlivenessProbe?: #HealthProbe\n\n\t//
+              +usage=Instructions for assessing whether the container is in a suitable
+              state to serve traffic.\n\treadinessProbe?: #HealthProbe\n}\n\n#ENV:
+              {\n\t// +usage=Environment variable name\n\tname: string\n\t// +usage=The
+              value of the environment variable\n\tvalue?: string\n\t// +usage=Specifies
+              a source the value of this var should come from\n\tvalueFrom?: {\n\t\t//
+              +usage=Selects a key of a secret in the pod's namespace\n\t\tsecretKeyRef:
+              {\n\t\t\t// +usage=The name of the secret in the pod's namespace to
+              select from\n\t\t\tname: string\n\t\t\t// +usage=The key of the secret
+              to select from. Must be a valid secret key\n\t\t\tkey: string\n\t\t}\n\t}\n}\n\n#HealthProbe:
+              {\n\n\t// +usage=Instructions for assessing container health by executing
+              a command. Either this attribute or the httpGet attribute or the tcpSocket
+              attribute MUST be specified. This attribute is mutually exclusive with
+              both the httpGet attribute and the tcpSocket attribute.\n\texec?: {\n\t\t//
+              +usage=A command to be executed inside the container to assess its health.
+              Each space delimited token of the command is a separate array element.
+              Commands exiting 0 are considered to be successful probes, whilst all
+              other exit codes are considered failures.\n\t\tcommand: [...string]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by executing an HTTP
+              GET request. Either this attribute or the exec attribute or the tcpSocket
+              attribute MUST be specified. This attribute is mutually exclusive with
+              both the exec attribute and the tcpSocket attribute.\n\thttpGet?: {\n\t\t//
+              +usage=The endpoint, relative to the port, to which the HTTP GET request
+              should be directed.\n\t\tpath: string\n\t\t// +usage=The TCP socket
+              within the container to which the HTTP GET request should be directed.\n\t\tport:
+              int\n\t\thttpHeaders?: [...{\n\t\t\tname:  string\n\t\t\tvalue: string\n\t\t}]\n\t}\n\n\t//
+              +usage=Instructions for assessing container health by probing a TCP
+              socket. Either this attribute or the exec attribute or the httpGet attribute
+              MUST be specified. This attribute is mutually exclusive with both the
+              exec attribute and the httpGet attribute.\n\ttcpSocket?: {\n\t\t// +usage=The
+              TCP socket within the container that should be probed to assess container
+              health.\n\t\tport: int\n\t}\n\n\t// +usage=Number of seconds after the
+              container is started before the first probe is initiated.\n\tinitialDelaySeconds:
+              *0 | int\n\n\t// +usage=How often, in seconds, to execute the probe.\n\tperiodSeconds:
+              *10 | int\n\n\t// +usage=Number of seconds after which the probe times
+              out.\n\ttimeoutSeconds: *1 | int\n\n\t// +usage=Minimum consecutive
+              successes for the probe to be considered successful after having failed.\n\tsuccessThreshold:
+              *1 | int\n\n\t// +usage=Number of consecutive failures required to determine
+              the container is not alive (liveness probe) or not ready (readiness
+              probe).\n\tfailureThreshold: *3 | int\n} \n"
+        workload:
+          definition:
+            apiVersion: apps.kruise.io/v1alpha1
+            kind: CloneSet
+    type: raw
+  - name: predownloadimage
+    properties:
+      apiVersion: core.oam.dev/v1beta1
+      kind: WorkflowStepDefinition
+      metadata:
+        name: predownloadimage
+      spec:
+        schematic:
+          cue:
+            template: "import (\"vela/op\")\nparameter: {\n  image: string\n  parallel:
+              int\n  kvs: [string]: string\n  type: *\"Always\" | string\n  activeDeadlineSeconds:
+              *1200 | int\n  ttlSecondsAfterFinished: *300 | int\n  backoffLimit?:
+              int\n  timeoutSeconds?: int\n  arr: [...string]\n}\n\npullImageJob:
+              op.#Apply & {\n  value:{\n    apiVersion: \"apps.kruise.io/v1alpha1\"\n
+              \   kind:       \"ImagePullJob\"\n    metadata: {\n      name: \"pull-image-job\"\n
+              \   }\n    spec: {\n      image: parameter.image\n      parallelism:
+              parameter.parallel\n      selector: matchLabels: parameter.kvs\n      completionPolicy:
+              {\n        type: parameter.type\n        activeDeadlineSeconds: parameter.activeDeadlineSeconds\n
+              \       ttlSecondsAfterFinished: parameter.ttlSecondsAfterFinished\n
+              \     }\n      pullPolicy: {\n        if parameter.backoffLimit != _|_
+              {\n          backoffLimit: parameter.backoffLimit\n        }\n        if
+              parameter.timeoutSeconds != _|_ {\n          timeoutSeconds: parameter.timeoutSeconds\n
+              \       }\n      }\n      pullSecrets: parameter.arr\n    }            \n
+              \ }          \n} \n"
+    type: raw
+  workflow:
+    steps:
+    - name: checking-depends-on
+      properties:
+        name: fluxcd
+        namespace: vela-system
+      type: depends-on-app
+    - name: apply-resources
+      type: apply-application
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/ns-flux-system.yaml

@@ -1,28 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  annotations:
-    addons.oam.dev/description: Create namespace for flux-system
-  name: ns-flux-system
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-      - name: flux-system
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: flux-system
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-status:
-  observedGeneration: 0

vela-templates/addons/auto-gen/ns-istio-system.yaml

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

vela-templates/addons/auto-gen/observability-asset.yaml

@@ -1,116 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  annotations:
-    addons.oam.dev/description: Preparations that observability need
-  name: observability-asset
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-      - name: observability
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: observability
-        type: raw
-      - name: import-grafana-dashboard
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Import dashboards to Grafana
-            name: import-grafana-dashboard
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                  \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:
-                  \                parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                  parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
-                  {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:
-                  \  *\"default\" | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
-                  *\"default\" | string\n\turls: [...string]\n} \n"
-        type: raw
-      - name: pure-ingress
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Enable public web traffic for the component
-                without creating a Service.
-            name: pure-ingress
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
-                  \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec:
-                  {\n\t\trules: [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths:
-                  [\n\t\t\t\t\tfor k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
-                  {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
-                  v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
-                  {\n\t// +usage=Specify the domain you want to expose\n\tdomain:
-                  string\n\n\t// +usage=Specify the mapping relationship between the
-                  http path and the workload port\n\thttp: [string]: int\n}\n"
-            status:
-              customStatus: |-
-                let igs = context.outputs.ingress.status.loadBalancer.ingress
-                if igs == _|_ {
-                  message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
-                }
-                if len(igs) > 0 {
-                  if igs[0].ip != _|_ {
-                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
-                  }
-                  if igs[0].ip == _|_ {
-                    message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
-                  }
-                }
-              healthPolicy: |
-                isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
-        type: raw
-      - name: register-grafana-datasource
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: TraitDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Add a datasource to Grafana
-            name: register-grafana-datasource
-            namespace: vela-system
-          spec:
-            schematic:
-              cue:
-                template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
-                  \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
-                  \                  parameter.grafanaServiceName\n\t\t\tnamespace:
-                  \                parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
-                  \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
-                  parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
-                  \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
-                  \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
-                  parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
-                  \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
-                  \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
-                  \                     string\n\taccess:                    *\"proxy\"
-                  | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
-                  | string\n}\n"
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-status:
-  observedGeneration: 0

vela-templates/addons/auto-gen/observability.yaml

@@ -1,135 +1,237 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: An out of the box solution for KubeVela observability
   name: observability
-  namespace: observability
+  namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: grafana-registration
-        properties:
-          chart: ./chart
-          git:
-            branch: master
-          repoType: git
-          targetNamespace: observability
-          url: https://github.com/oam-dev/grafana-registration
-          values:
-            replicaCount: 1
-        type: helm
-      - name: grafana
-        properties:
-          chart: grafana
-          releaseName: grafana
-          repoType: helm
-          targetNamespace: observability
-          url: https://charts.kubevela.net/addons
-          version: 6.14.1
-        traits:
-        - properties:
-            domain: '[[ index .Args "grafana-domain" ]]'
-            http:
-              /: 80
-          type: pure-ingress
-        - properties:
-            credentialSecret: grafana
-            credentialSecretNamespace: observability
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
-            urls:
-            - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
-            - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
-            - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
-            - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
-          type: import-grafana-dashboard
-        type: helm
-      - name: loki
-        properties:
-          chart: loki-stack
-          releaseName: loki
-          repoType: helm
-          targetNamespace: observability
-          url: https://charts.kubevela.net/addons
-          version: 2.4.1
-        traits:
-        - properties:
-            access: proxy
-            credentialSecret: grafana
-            credentialSecretNamespace: observability
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
-            name: loki
-            namespace: observability
-            service: loki
-            type: loki
-          type: register-grafana-datasource
-        type: helm
-      - name: prometheus-server
-        properties:
-          chart: prometheus
-          releaseName: prometheus
-          repoType: helm
-          targetNamespace: observability
-          url: https://charts.kubevela.net/addons
-          values:
-            alertmanager:
-              persistentVolume:
-                enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true"
-                  ]]'
-                size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
-                storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
-            server:
-              persistentVolume:
-                enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
-                size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
-                storageClass: '[[ index .Args "server-pvc-class" ]]'
-          version: 14.4.1
-        traits:
-        - properties:
-            access: proxy
-            credentialSecret: grafana
-            credentialSecretNamespace: observability
-            grafanaServiceName: grafana
-            grafanaServiceNamespace: observability
-            name: prometheus
-            namespace: observability
-            service: prometheus-server
-            type: prometheus
-          type: register-grafana-datasource
-        type: helm
-      - name: kube-state-metrics
-        properties:
-          chart: kube-state-metrics
-          repoType: helm
-          targetNamespace: observability
-          url: https://charts.kubevela.net/addons
-          values:
-            image:
-              repository: oamdev/kube-state-metrics
-              tag: v2.1.0
-          version: 3.4.1
-        type: helm
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-  dependsOn:
-  - ref:
+  components:
+  - name: ns-observability
+    properties:
+      apiVersion: v1
+      kind: Namespace
+      metadata:
+        name: observability
+    type: raw
+  - name: import-grafana-dashboard-traitdef
+    properties:
       apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: fluxcd
-      namespace: vela-system
-  - ref:
+      kind: TraitDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Import dashboards to Grafana
+        name: import-grafana-dashboard
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+              \      \"ImportDashboard\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+              \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+              \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+              parameter.credentialSecretNamespace\n\t\t}\n\t\turls: parameter.urls\n\t}\n}\nparameter:
+              {\n\tgrafanaServiceName:        string\n\tgrafanaServiceNamespace:   *\"default\"
+              | string\n\tcredentialSecret:          string\n\tcredentialSecretNamespace:
+              *\"default\" | string\n\turls: [...string]\n}\n"
+    type: raw
+  - name: pure-ingress-traitdef
+    properties:
       apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: observability-asset
-      namespace: vela-system
+      kind: TraitDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Enable public web traffic for the component
+            without creating a Service.
+        name: pure-ingress
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "\noutputs: ingress: {\n\tapiVersion: \"networking.k8s.io/v1beta1\"\n\tkind:
+              \      \"Ingress\"\n\tmetadata:\n\t\tname: context.name\n\tspec: {\n\t\trules:
+              [{\n\t\t\thost: parameter.domain\n\t\t\thttp: {\n\t\t\t\tpaths: [\n\t\t\t\t\tfor
+              k, v in parameter.http {\n\t\t\t\t\t\tpath: k\n\t\t\t\t\t\tbackend:
+              {\n\t\t\t\t\t\t\tserviceName: context.name\n\t\t\t\t\t\t\tservicePort:
+              v\n\t\t\t\t\t\t}\n\t\t\t\t\t},\n\t\t\t\t]\n\t\t\t}\n\t\t}]\n\t}\n}\n\nparameter:
+              {\n\t// +usage=Specify the domain you want to expose\n\tdomain: string\n\n\t//
+              +usage=Specify the mapping relationship between the http path and the
+              workload port\n\thttp: [string]: int\n}\n"
+        status:
+          customStatus: |-
+            let igs = context.outputs.ingress.status.loadBalancer.ingress
+            if igs == _|_ {
+              message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+            }
+            if len(igs) > 0 {
+              if igs[0].ip != _|_ {
+                message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+              }
+              if igs[0].ip == _|_ {
+                message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+              }
+            }
+          healthPolicy: |
+            isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+    type: raw
+  - name: register-grafana-datasource-traitdef
+    properties:
+      apiVersion: core.oam.dev/v1beta1
+      kind: TraitDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Add a datasource to Grafana
+        name: register-grafana-datasource
+        namespace: vela-system
+      spec:
+        schematic:
+          cue:
+            template: "outputs: registerdatasource: {\n\tapiVersion: \"grafana.extension.oam.dev/v1alpha1\"\n\tkind:
+              \      \"DatasourceRegistration\"\n\tspec: {\n\t\tgrafana: {\n\t\t\tservice:
+              \                  parameter.grafanaServiceName\n\t\t\tnamespace:                 parameter.grafanaServiceNamespace\n\t\t\tcredentialSecret:
+              \         parameter.credentialSecret\n\t\t\tcredentialSecretNamespace:
+              parameter.credentialSecretNamespace\n\t\t}\n\t\tdatasource: {\n\t\t\tname:
+              \     parameter.name\n\t\t\ttype:      parameter.type\n\t\t\taccess:
+              \   parameter.access\n\t\t\tservice:   parameter.service\n\t\t\tnamespace:
+              parameter.namespace\n\t\t}\n\t}\n}\n\nparameter: {\n\tgrafanaServiceName:
+              \       string\n\tgrafanaServiceNamespace:   *\"default\" | string\n\tcredentialSecret:
+              \         string\n\tcredentialSecretNamespace: string\n\tname:                      string\n\ttype:
+              \                     string\n\taccess:                    *\"proxy\"
+              | string\n\tservice:                   string\n\tnamespace:                 *\"default\"
+              | string\n}\n"
+    type: raw
+  - name: grafana-registration
+    properties:
+      chart: ./chart
+      git:
+        branch: master
+      repoType: git
+      targetNamespace: observability
+      url: https://github.com/oam-dev/grafana-registration
+      values:
+        replicaCount: 1
+    type: helm
+  - name: grafana
+    properties:
+      chart: grafana
+      releaseName: grafana
+      repoType: helm
+      targetNamespace: observability
+      url: https://charts.kubevela.net/addons
+      version: 6.14.1
+    traits:
+    - properties:
+        domain: '[[ index .Args "grafana-domain" ]]'
+        http:
+          /: 80
+      type: pure-ingress
+    - properties:
+        credentialSecret: grafana
+        credentialSecretNamespace: observability
+        grafanaServiceName: grafana
+        grafanaServiceNamespace: observability
+        urls:
+        - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
+        - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
+        - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
+        - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json
+      type: import-grafana-dashboard
+    type: helm
+  - name: loki
+    properties:
+      chart: loki-stack
+      releaseName: loki
+      repoType: helm
+      targetNamespace: observability
+      url: https://charts.kubevela.net/addons
+      version: 2.4.1
+    traits:
+    - properties:
+        access: proxy
+        credentialSecret: grafana
+        credentialSecretNamespace: observability
+        grafanaServiceName: grafana
+        grafanaServiceNamespace: observability
+        name: loki
+        namespace: observability
+        service: loki
+        type: loki
+      type: register-grafana-datasource
+    type: helm
+  - name: prometheus-server
+    properties:
+      chart: prometheus
+      releaseName: prometheus
+      repoType: helm
+      targetNamespace: observability
+      url: https://charts.kubevela.net/addons
+      values:
+        alertmanager:
+          persistentVolume:
+            enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
+            size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
+            storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
+        server:
+          persistentVolume:
+            enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
+            size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
+            storageClass: '[[ index .Args "server-pvc-class" ]]'
+      version: 14.4.1
+    traits:
+    - properties:
+        access: proxy
+        credentialSecret: grafana
+        credentialSecretNamespace: observability
+        grafanaServiceName: grafana
+        grafanaServiceNamespace: observability
+        name: prometheus
+        namespace: observability
+        service: prometheus-server
+        type: prometheus
+      type: register-grafana-datasource
+    type: helm
+  - name: kube-state-metrics
+    properties:
+      chart: kube-state-metrics
+      repoType: helm
+      targetNamespace: observability
+      url: https://charts.kubevela.net/addons
+      values:
+        image:
+          repository: oamdev/kube-state-metrics
+          tag: v2.1.0
+      version: 3.4.1
+    type: helm
+  workflow:
+    steps:
+    - name: checking-depends-on
+      properties:
+        name: fluxcd
+        namespace: vela-system
+      type: depends-on-app
+    - name: apply-ns
+      properties:
+        component: ns-observability
+      type: apply-component
+    - name: apply-trait-1
+      properties:
+        component: import-grafana-dashboard-traitdef
+      type: apply-component
+    - name: apply-trait-2
+      properties:
+        component: pure-ingress-traitdef
+      type: apply-component
+    - name: apply-trait-3
+      properties:
+        component: register-grafana-datasource-traitdef
+      type: apply-component
+    - name: apply-resources
+      type: apply-remaining
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/prometheus.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Prometheus is an open-source systems monitoring and
@@ -7,28 +7,27 @@ metadata:
   name: prometheus
   namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: prometheus
-        properties:
-          chart: premetheus
-          repoType: helm
-          url: https://prometheus-community.github.io/helm-charts
-        type: helm
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-  dependsOn:
-  - ref:
-      apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: fluxcd
-      namespace: vela-system
+  components:
+  - name: prometheus
+    properties:
+      chart: premetheus
+      repoType: helm
+      url: https://prometheus-community.github.io/helm-charts
+    type: helm
+  workflow:
+    steps:
+    - name: checking-depends-on
+      properties:
+        name: fluxcd
+        namespace: vela-system
+      type: depends-on-app
+    - name: apply-resources
+      type: apply-application
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/terraform-provider-alibaba.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
@@ -7,47 +7,43 @@ metadata:
   name: terraform-provider-alibaba
   namespace: default
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: alibaba-account-creds
-        properties:
-          apiVersion: v1
-          kind: Secret
-          metadata:
+  components:
+  - name: alibaba-account-creds
+    properties:
+      apiVersion: v1
+      kind: Secret
+      metadata:
+        name: alibaba-provider-secret
+        namespace: vela-system
+      stringData:
+        credentials: |
+          accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
+          accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
+          securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
+      type: Opaque
+    type: raw
+  - name: default
+    properties:
+      apiVersion: terraform.core.oam.dev/v1beta1
+      kind: Provider
+      metadata:
+        name: default
+        namespace: default
+      spec:
+        credentials:
+          secretRef:
+            key: credentials
             name: alibaba-account-creds
             namespace: vela-system
-          stringData:
-            credentials: |
-              accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
-              accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
-              securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
-          type: Opaque
-        type: raw
-      - name: default
-        properties:
-          apiVersion: terraform.core.oam.dev/v1beta1
-          kind: Provider
-          metadata:
-            name: default
-            namespace: default
-          spec:
-            credentials:
-              secretRef:
-                key: credentials
-                name: alibaba-account-creds
-                namespace: vela-system
-              source: Secret
-            provider: alibaba
-            region: '[[ index .Args "ALICLOUD_REGION" ]]'
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
+          source: Secret
+        provider: alibaba
+        region: '[[ index .Args "ALICLOUD_REGION" ]]'
+    type: raw
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/terraform-provider-azure.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Azure
@@ -7,47 +7,43 @@ metadata:
   name: terraform-provider-azure
   namespace: default
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: azure-account-creds
-        properties:
-          apiVersion: v1
-          kind: Secret
-          metadata:
+  components:
+  - name: azure-account-creds
+    properties:
+      apiVersion: v1
+      kind: Secret
+      metadata:
+        name: azure-account-creds
+        namespace: vela-system
+      stringData:
+        credentials: |
+          armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
+          armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
+          armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
+          armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
+      type: Opaque
+    type: raw
+  - name: azure
+    properties:
+      apiVersion: terraform.core.oam.dev/v1beta1
+      kind: Provider
+      metadata:
+        name: azure
+        namespace: default
+      spec:
+        credentials:
+          secretRef:
+            key: credentials
             name: azure-account-creds
             namespace: vela-system
-          stringData:
-            credentials: |
-              armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
-              armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
-              armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
-              armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
-          type: Opaque
-        type: raw
-      - name: azure
-        properties:
-          apiVersion: terraform.core.oam.dev/v1beta1
-          kind: Provider
-          metadata:
-            name: azure
-            namespace: default
-          spec:
-            credentials:
-              secretRef:
-                key: credentials
-                name: azure-account-creds
-                namespace: vela-system
-              source: Secret
-            provider: azure
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
+          source: Secret
+        provider: azure
+    type: raw
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/auto-gen/terraform.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Terraform Controller is a Kubernetes Controller for
@@ -7,440 +7,482 @@ metadata:
   name: terraform
   namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
-      - name: terraform-controller
-        properties:
-          chart: terraform-controller
-          repoType: helm
-          url: https://charts.kubevela.net/addons
-          version: 0.1.19
-        type: helm
-      - name: terraform-system
-        properties:
-          apiVersion: v1
-          kind: Namespace
-          metadata:
-            name: terraform-system
-        type: raw
-      - name: alibaba-ack
-        properties:
-          apiVersion: core.oam.dev/v1beta1
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba
-                Cloud ACK cluster
-            labels:
-              type: terraform
-            name: alibaba-ack
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  module "kubernetes" {
-                    source = "github.com/zzxwill/terraform-alicloud-kubernetes"
-                    new_nat_gateway = true
-                    vpc_name = var.vpc_name
-                    vpc_cidr = var.vpc_cidr
-                    vswitch_name_prefix = var.vswitch_name_prefix
-                    vswitch_cidrs = var.vswitch_cidrs
-                    master_instance_types = var.master_instance_types
-                    worker_instance_types = var.worker_instance_types
-                    k8s_pod_cidr = var.k8s_pod_cidr
-                    k8s_service_cidr = var.k8s_service_cidr
-                    k8s_worker_number = var.k8s_worker_number
-                    cpu_core_count = var.cpu_core_count
-                    memory_size = var.memory_size
-                    zone_id = var.zone_id
-                    k8s_version = var.k8s_version
-                    k8s_name_prefix = var.k8s_name_prefix
-                  }
-                  ######################
-                  # Instance types variables
-                  ######################
-                  variable "cpu_core_count" {
-                    description = "CPU core count is used to fetch instance types."
-                    type = number
-                    default = 4
-                  }
-                  variable "memory_size" {
-                    description = "Memory size used to fetch instance types."
-                    type = number
-                    default = 8
-                  }
-                  ######################
-                  # VPC variables
-                  ######################
-                  variable "vpc_name" {
-                    description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
-                    type = string
-                    default = "tf-k8s-vpc"
-                  }
-                  variable "vpc_cidr" {
-                    description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
-                    type = string
-                    default = "10.0.0.0/8"
-                  }
-                  ######################
-                  # VSwitch variables
-                  ######################
-                  variable "vswitch_name_prefix" {
-                    type = string
-                    description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
-                    default = "tf-k8s-vsw"
-                  }
-                  variable "number_format" {
-                    description = "The number format used to output."
-                    type = string
-                    default = "%02d"
-                  }
-                  variable "vswitch_ids" {
-                    description = "List of existing vswitch id."
-                    type = list
-                    default = []
-                  }
-                  variable "vswitch_cidrs" {
-                    description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
-                    type = list
-                    default = [
-                      "10.1.0.0/16",
-                      "10.2.0.0/16",
-                      "10.3.0.0/16"]
-                  }
-                  variable "k8s_name_prefix" {
-                    description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
-                    type = string
-                    default = "poc"
-                  }
-                  variable "new_nat_gateway" {
-                    type = bool
-                    description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
-                    default = true
-                  }
-                  variable "master_instance_types" {
-                    description = "The ecs instance types used to launch master nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c5.xlarge",
-                      "ecs.n4.xlarge",
-                      # "ecs.n1.large",
-                      # "ecs.sn1.large",
-                      # "ecs.s6-c1m2.xlarge",
-                      # "ecs.c6e.xlarge"
-                    ]
-                  }
-                  variable "worker_instance_types" {
-                    description = "The ecs instance types used to launch worker nodes."
-                    type = list
-                    default = [
-                      # hongkong
-                      "ecs.sn1ne.xlarge",
-                      # hongkong
-                      "ecs.c6.xlarge",
-                      # hongkong
-                      "ecs.c4.xlarge",
-                      # hongkong
-                      "ecs.c6e.xlarge",
-                      "ecs.n4.xlarge",
-                      //    "ecs.n1.large",
-                      //    "ecs.sn1.large",
-                      //    "ecs.s6-c1m2.xlarge"
-                    ]
-                  }
-                  variable "node_cidr_mask" {
-                    type = number
-                    description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
-                    default = 24
-                  }
-                  variable "enable_ssh" {
-                    description = "Enable login to the node through SSH."
-                    type = bool
-                    default = true
-                  }
-                  variable "install_cloud_monitor" {
-                    description = "Install cloud monitor agent on ECS."
-                    type = bool
-                    default = true
-                  }
-                  variable "cpu_policy" {
-                    type = string
-                    description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
-                    default = "none"
-                  }
-                  variable "proxy_mode" {
-                    description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
-                    type = string
-                    default = "iptables"
-                  }
-                  variable "password" {
-                    description = "The password of ECS instance."
-                    type = string
-                    default = "Just4Test"
-                  }
-                  variable "k8s_worker_number" {
-                    description = "The number of worker nodes in kubernetes cluster."
-                    type = number
-                    default = 2
-                  }
-                  # k8s_pod_cidr is only for flannel network
-                  variable "k8s_pod_cidr" {
-                    description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
-                    type = string
-                    default = "172.20.0.0/16"
-                  }
-                  variable "k8s_service_cidr" {
-                    description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
-                    type = string
-                    default = "192.168.0.0/16"
-                  }
-                  variable "k8s_version" {
-                    description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
-                    type = string
-                    default = "1.20.4-aliyun.1"
-                  }
-                  variable "zone_id" {
-                    description = "Availability Zone ID"
-                    type = string
-                    default = "cn-hongkong-b"
-                    # "cn-beijing-a"
-                  }
-                  output "name" {
-                    value = module.kubernetes.name
-                  }
-                  output "kubeconfig" {
-                    value = module.kubernetes.kubeconfig
-                  }
-                  output "cluster_ca_cert" {
-                    value = module.kubernetes.cluster_ca_cert
-                  }
-                  output "client_cert" {
-                    value = module.kubernetes.client_cert
-                  }
-                  output "client_key" {
-                    value = module.kubernetes.client_key
-                  }
-                  output "api_server_internet" {
-                    value = module.kubernetes.api_server_internet
-                  }
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-eip
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba
-                Cloud Elastic IP
-            labels:
-              type: terraform
-            name: alibaba-eip
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
-                type: remote
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-oss
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba
-                Cloud OSS object
-            labels:
-              type: terraform
-            name: alibaba-oss
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n
-                  \ bucket = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\"
-                  {\n  value = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
-                  \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
-                  \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
-                  ACL, supported 'private', 'public-read', 'public-read-write'\"\n
-                  \ default = \"private\"\n  type = string\n} \n"
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: alibaba-rds
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Alibaba
-                Cloud RDS object
-            labels:
-              type: terraform
-            name: alibaba-rds
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  module "rds" {
-                    source = "terraform-alicloud-modules/rds/alicloud"
-                    engine = "MySQL"
-                    engine_version = "8.0"
-                    instance_type = "rds.mysql.c1.large"
-                    instance_storage = "20"
-                    instance_name = var.instance_name
-                    account_name = var.account_name
-                    password = var.password
-                  }
-
-                  output "DB_NAME" {
-                    value = module.rds.this_db_instance_name
-                  }
-                  output "DB_USER" {
-                    value = module.rds.this_db_database_account
-                  }
-                  output "DB_PORT" {
-                    value = module.rds.this_db_instance_port
-                  }
-                  output "DB_HOST" {
-                    value = module.rds.this_db_instance_connection_string
-                  }
-                  output "DB_PASSWORD" {
-                    value = var.password
-                  }
-
-                  variable "instance_name" {
-                    description = "RDS instance name"
-                    type = string
-                    default = "poc"
-                  }
-
-                  variable "account_name" {
-                    description = "RDS instance user account name"
-                    type = string
-                    default = "oam"
-                  }
-
-                  variable "password" {
-                    description = "RDS instance account password"
-                    type = string
-                    default = "Xyfff83jfewGGfaked"
-                  }
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-      - name: azure-database-mariadb
-        properties:
-          apiVersion: core.oam.dev/v1alpha2
-          kind: ComponentDefinition
-          metadata:
-            annotations:
-              definition.oam.dev/description: Terraform configuration for Azure Database
-                Mariadb
-              provider: azure
-            labels:
-              type: terraform
-            name: azure-database-mariadb
-            namespace: vela-system
-          spec:
-            schematic:
-              terraform:
-                configuration: |
-                  # Configure the Microsoft Azure Provider
-                  provider "azurerm" {
-                    features {}
-                  }
-
-                  resource "azurerm_resource_group" "example" {
-                    name = "tfex-mariadb-database-RG"
-                    location = "West Europe"
-                  }
-
-                  resource "azurerm_mariadb_server" "example" {
-                    name = "mariadb-svr-sample"
-                    location = azurerm_resource_group.example.location
-                    resource_group_name = azurerm_resource_group.example.name
-
-                    sku_name = "B_Gen5_2"
-
-                    storage_mb = 51200
-                    backup_retention_days = 7
-                    geo_redundant_backup_enabled = false
-
-                    administrator_login = var.username
-                    administrator_login_password = var.password
-                    version = "10.2"
-                    ssl_enforcement_enabled = true
-                  }
-
-                  resource "azurerm_mariadb_database" "example" {
-                    name = var.name
-                    resource_group_name = azurerm_resource_group.example.name
-                    server_name = azurerm_mariadb_server.example.name
-                    charset = "utf8"
-                    collation = "utf8_general_ci"
-                  }
-
-                  variable "name" {
-                    default = "mariadb_database"
-                    type = string
-                    description = "Database instance name"
-                  }
-
-                  variable "username" {
-                    default = "acctestun"
-                    type = string
-                    description = "Database instance username"
-                  }
-
-                  variable "password" {
-                    default = "H@Sh1CoR3!faked"
-                    type = string
-                    description = "Database instance password"
-                  }
-                providerRef:
-                  name: azure
-                  namespace: default
-            workload:
-              definition:
-                apiVersion: terraform.core.oam.dev/v1beta1
-                kind: Configuration
-        type: raw
-    status:
-      rollout:
-        batchRollingState: ""
-        currentBatch: 0
-        lastTargetAppRevision: ""
-        rollingState: ""
-        upgradedReadyReplicas: 0
-        upgradedReplicas: 0
-  dependsOn:
-  - ref:
+  components:
+  - name: ns-terraform-system
+    properties:
+      apiVersion: v1
+      kind: Namespace
+      metadata:
+        name: terraform-system
+    type: raw
+  - name: terraform-controller
+    properties:
+      chart: terraform-controller
+      repoType: helm
+      url: https://charts.kubevela.net/addons
+      version: 0.1.19
+    type: helm
+  - name: alibaba-ack
+    properties:
       apiVersion: core.oam.dev/v1beta1
-      kind: Initializer
-      name: fluxcd
-      namespace: vela-system
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+            ACK cluster
+        labels:
+          type: terraform
+        name: alibaba-ack
+        namespace: vela-system
+      spec:
+        schematic:
+          terraform:
+            configuration: |
+              module "kubernetes" {
+                source = "github.com/zzxwill/terraform-alicloud-kubernetes"
+                new_nat_gateway = true
+                vpc_name = var.vpc_name
+                vpc_cidr = var.vpc_cidr
+                vswitch_name_prefix = var.vswitch_name_prefix
+                vswitch_cidrs = var.vswitch_cidrs
+                master_instance_types = var.master_instance_types
+                worker_instance_types = var.worker_instance_types
+                k8s_pod_cidr = var.k8s_pod_cidr
+                k8s_service_cidr = var.k8s_service_cidr
+                k8s_worker_number = var.k8s_worker_number
+                cpu_core_count = var.cpu_core_count
+                memory_size = var.memory_size
+                zone_id = var.zone_id
+                k8s_version = var.k8s_version
+                k8s_name_prefix = var.k8s_name_prefix
+              }
+              ######################
+              # Instance types variables
+              ######################
+              variable "cpu_core_count" {
+                description = "CPU core count is used to fetch instance types."
+                type = number
+                default = 4
+              }
+              variable "memory_size" {
+                description = "Memory size used to fetch instance types."
+                type = number
+                default = 8
+              }
+              ######################
+              # VPC variables
+              ######################
+              variable "vpc_name" {
+                description = "The vpc name used to create a new vpc when 'vpc_id' is not specified. Default to variable `example_name`"
+                type = string
+                default = "tf-k8s-vpc"
+              }
+              variable "vpc_cidr" {
+                description = "The cidr block used to launch a new vpc when 'vpc_id' is not specified."
+                type = string
+                default = "10.0.0.0/8"
+              }
+              ######################
+              # VSwitch variables
+              ######################
+              variable "vswitch_name_prefix" {
+                type = string
+                description = "The vswitch name prefix used to create several new vswitches. Default to variable 'example_name'."
+                default = "tf-k8s-vsw"
+              }
+              variable "number_format" {
+                description = "The number format used to output."
+                type = string
+                default = "%02d"
+              }
+              variable "vswitch_ids" {
+                description = "List of existing vswitch id."
+                type = list
+                default = []
+              }
+              variable "vswitch_cidrs" {
+                description = "List of cidr blocks used to create several new vswitches when 'vswitch_ids' is not specified."
+                type = list
+                default = [
+                  "10.1.0.0/16",
+                  "10.2.0.0/16",
+                  "10.3.0.0/16"]
+              }
+              variable "k8s_name_prefix" {
+                description = "The name prefix used to create several kubernetes clusters. Default to variable `example_name`"
+                type = string
+                default = "poc"
+              }
+              variable "new_nat_gateway" {
+                type = bool
+                description = "Whether to create a new nat gateway. In this template, a new nat gateway will create a nat gateway, eip and server snat entries."
+                default = true
+              }
+              variable "master_instance_types" {
+                description = "The ecs instance types used to launch master nodes."
+                type = list
+                default = [
+                  # hongkong
+                  "ecs.sn1ne.xlarge",
+                  # hongkong
+                  "ecs.c6.xlarge",
+                  # hongkong
+                  "ecs.c4.xlarge",
+                  # hongkong
+                  "ecs.c5.xlarge",
+                  "ecs.n4.xlarge",
+                  # "ecs.n1.large",
+                  # "ecs.sn1.large",
+                  # "ecs.s6-c1m2.xlarge",
+                  # "ecs.c6e.xlarge"
+                ]
+              }
+              variable "worker_instance_types" {
+                description = "The ecs instance types used to launch worker nodes."
+                type = list
+                default = [
+                  # hongkong
+                  "ecs.sn1ne.xlarge",
+                  # hongkong
+                  "ecs.c6.xlarge",
+                  # hongkong
+                  "ecs.c4.xlarge",
+                  # hongkong
+                  "ecs.c6e.xlarge",
+                  "ecs.n4.xlarge",
+                  //    "ecs.n1.large",
+                  //    "ecs.sn1.large",
+                  //    "ecs.s6-c1m2.xlarge"
+                ]
+              }
+              variable "node_cidr_mask" {
+                type = number
+                description = "The node cidr block to specific how many pods can run on single node. Valid values: [24-28]."
+                default = 24
+              }
+              variable "enable_ssh" {
+                description = "Enable login to the node through SSH."
+                type = bool
+                default = true
+              }
+              variable "install_cloud_monitor" {
+                description = "Install cloud monitor agent on ECS."
+                type = bool
+                default = true
+              }
+              variable "cpu_policy" {
+                type = string
+                description = "kubelet cpu policy. Valid values: 'none','static'. Default to 'none'."
+                default = "none"
+              }
+              variable "proxy_mode" {
+                description = "Proxy mode is option of kube-proxy. Valid values: 'ipvs','iptables'. Default to 'iptables'."
+                type = string
+                default = "iptables"
+              }
+              variable "password" {
+                description = "The password of ECS instance."
+                type = string
+                default = "Just4Test"
+              }
+              variable "k8s_worker_number" {
+                description = "The number of worker nodes in kubernetes cluster."
+                type = number
+                default = 2
+              }
+              # k8s_pod_cidr is only for flannel network
+              variable "k8s_pod_cidr" {
+                description = "The kubernetes pod cidr block. It cannot be equals to vpc's or vswitch's and cannot be in them."
+                type = string
+                default = "172.20.0.0/16"
+              }
+              variable "k8s_service_cidr" {
+                description = "The kubernetes service cidr block. It cannot be equals to vpc's or vswitch's or pod's and cannot be in them."
+                type = string
+                default = "192.168.0.0/16"
+              }
+              variable "k8s_version" {
+                description = "The version of the kubernetes version.  Valid values: '1.16.6-aliyun.1','1.14.8-aliyun.1'. Default to '1.16.6-aliyun.1'."
+                type = string
+                default = "1.20.4-aliyun.1"
+              }
+              variable "zone_id" {
+                description = "Availability Zone ID"
+                type = string
+                default = "cn-hongkong-b"
+                # "cn-beijing-a"
+              }
+              output "name" {
+                value = module.kubernetes.name
+              }
+              output "kubeconfig" {
+                value = module.kubernetes.kubeconfig
+              }
+              output "cluster_ca_cert" {
+                value = module.kubernetes.cluster_ca_cert
+              }
+              output "client_cert" {
+                value = module.kubernetes.client_cert
+              }
+              output "client_key" {
+                value = module.kubernetes.client_key
+              }
+              output "api_server_internet" {
+                value = module.kubernetes.api_server_internet
+              }
+        workload:
+          definition:
+            apiVersion: terraform.core.oam.dev/v1beta1
+            kind: Configuration
+    type: raw
+  - name: alibaba-eip
+    properties:
+      apiVersion: core.oam.dev/v1alpha2
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+            Elastic IP
+        labels:
+          type: terraform
+        name: alibaba-eip
+        namespace: vela-system
+      spec:
+        schematic:
+          terraform:
+            configuration: https://github.com/oam-dev/terraform-alibaba-eip.git
+            type: remote
+        workload:
+          definition:
+            apiVersion: terraform.core.oam.dev/v1beta1
+            kind: Configuration
+    type: raw
+  - name: alibaba-oss
+    properties:
+      apiVersion: core.oam.dev/v1alpha2
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+            OSS object
+        labels:
+          type: terraform
+        name: alibaba-oss
+        namespace: vela-system
+      spec:
+        schematic:
+          terraform:
+            configuration: "resource \"alicloud_oss_bucket\" \"bucket-acl\" {\n  bucket
+              = var.bucket\n  acl = var.acl\n}\noutput \"BUCKET_NAME\" {\n  value
+              = \"${alicloud_oss_bucket.bucket-acl.bucket}.${alicloud_oss_bucket.bucket-acl.extranet_endpoint}\"\n}\nvariable
+              \"bucket\" {\n  description = \"OSS bucket name\"\n  default = \"vela-website\"\n
+              \ type = string\n}\nvariable \"acl\" {\n  description = \"OSS bucket
+              ACL, supported 'private', 'public-read', 'public-read-write'\"\n  default
+              = \"private\"\n  type = string\n} \n"
+        workload:
+          definition:
+            apiVersion: terraform.core.oam.dev/v1beta1
+            kind: Configuration
+    type: raw
+  - name: alibaba-rds
+    properties:
+      apiVersion: core.oam.dev/v1alpha2
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Terraform configuration for Alibaba Cloud
+            RDS object
+        labels:
+          type: terraform
+        name: alibaba-rds
+        namespace: vela-system
+      spec:
+        schematic:
+          terraform:
+            configuration: |
+              module "rds" {
+                source = "terraform-alicloud-modules/rds/alicloud"
+                engine = "MySQL"
+                engine_version = "8.0"
+                instance_type = "rds.mysql.c1.large"
+                instance_storage = "20"
+                instance_name = var.instance_name
+                account_name = var.account_name
+                password = var.password
+              }
+
+              output "DB_NAME" {
+                value = module.rds.this_db_instance_name
+              }
+              output "DB_USER" {
+                value = module.rds.this_db_database_account
+              }
+              output "DB_PORT" {
+                value = module.rds.this_db_instance_port
+              }
+              output "DB_HOST" {
+                value = module.rds.this_db_instance_connection_string
+              }
+              output "DB_PASSWORD" {
+                value = var.password
+              }
+
+              variable "instance_name" {
+                description = "RDS instance name"
+                type = string
+                default = "poc"
+              }
+
+              variable "account_name" {
+                description = "RDS instance user account name"
+                type = string
+                default = "oam"
+              }
+
+              variable "password" {
+                description = "RDS instance account password"
+                type = string
+                default = "Xyfff83jfewGGfaked"
+              }
+        workload:
+          definition:
+            apiVersion: terraform.core.oam.dev/v1beta1
+            kind: Configuration
+    type: raw
+  - name: azure-database-mariadb
+    properties:
+      apiVersion: core.oam.dev/v1alpha2
+      kind: ComponentDefinition
+      metadata:
+        annotations:
+          definition.oam.dev/description: Terraform configuration for Azure Database
+            Mariadb
+          provider: azure
+        labels:
+          type: terraform
+        name: azure-database-mariadb
+        namespace: vela-system
+      spec:
+        schematic:
+          terraform:
+            configuration: |
+              # Configure the Microsoft Azure Provider
+              provider "azurerm" {
+                features {}
+              }
+
+              resource "azurerm_resource_group" "example" {
+                name = var.resource_group
+                location = var.location
+              }
+
+              resource "azurerm_mariadb_server" "example" {
+                name = var.server_name
+                location = var.location
+                resource_group_name = azurerm_resource_group.example.name
+
+                sku_name = "B_Gen5_2"
+
+                storage_mb = 51200
+                backup_retention_days = 7
+                geo_redundant_backup_enabled = false
+
+                administrator_login = var.username
+                administrator_login_password = var.password
+                version = "10.2"
+                ssl_enforcement_enabled = true
+              }
+
+              resource "azurerm_mariadb_database" "example" {
+                name = var.db_name
+                resource_group_name = azurerm_resource_group.example.name
+                server_name = azurerm_mariadb_server.example.name
+                charset = "utf8"
+                collation = "utf8_general_ci"
+              }
+
+              variable "server_name" {
+                type = string
+                description = "mariadb server name"
+                default = "mariadb-svr-sample"
+              }
+
+              variable "db_name" {
+                default = "backend"
+                type = string
+                description = "Database instance name"
+              }
+
+              variable "username" {
+                default = "acctestun"
+                type = string
+                description = "Database instance username"
+              }
+
+              variable "password" {
+                default = "H@Sh1CoR3!faked"
+                type = string
+                description = "Database instance password"
+              }
+
+              variable "location" {
+                description = "Azure location"
+                type = string
+                default = "West Europe"
+              }
+
+              variable "resource_group" {
+                description = "Resource group"
+                type = string
+                default = "kubevela-group"
+              }
+
+              output "SERVER_NAME" {
+                value = var.server_name
+              }
+
+              output "DB_NAME" {
+                value = var.db_name
+              }
+              output "DB_USER" {
+                value = var.username
+              }
+              output "DB_PASSWORD" {
+                sensitive = true
+                value = var.password
+              }
+              output "DB_PORT" {
+                value = "3306"
+              }
+              output "DB_HOST" {
+                value = azurerm_mariadb_server.example.fqdn
+              }
+            providerRef:
+              name: azure
+              namespace: default
+        workload:
+          definition:
+            apiVersion: terraform.core.oam.dev/v1beta1
+            kind: Configuration
+    type: raw
+  workflow:
+    steps:
+    - name: checking-depends-on
+      properties:
+        name: fluxcd
+        namespace: vela-system
+      type: depends-on-app
+    - name: apply-ns
+      properties:
+        component: ns-terraform-system
+      type: apply-component
+    - name: apply-resources
+      type: apply-remaining
 status:
-  observedGeneration: 0
+  rollout:
+    batchRollingState: ""
+    currentBatch: 0
+    lastTargetAppRevision: ""
+    rollingState: ""
+    upgradedReadyReplicas: 0
+    upgradedReplicas: 0

vela-templates/addons/fluxcd/definitions/helm-release.yaml

@@ -146,4 +146,34 @@ spec:
         }
   status:
     # helmRelease's `ready` condition must be the first one
-    healthPolicy: 'isHealth: len(context.outputs.release.status.conditions) != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
+    healthPolicy: 'isHealth: len(context.outputs.release.status.conditions) != 0 && context.outputs.release.status.conditions[0]["status"]=="True"'
+    customStatus: |-
+      repoMessage:    string
+      releaseMessage: string
+      if context.output.status == _|_ {
+      	repoMessage:    "Fetching repository"
+      	releaseMessage: "Wating repository ready"
+      }
+      if context.output.status != _|_ {
+      	repoStatus: context.output.status
+      	if repoStatus.conditions[0]["type"] != "Ready" {
+      		repoMessage: "Fetch repository fail"
+      	}
+      	if repoStatus.conditions[0]["type"] == "Ready" {
+      		repoMessage: "Fetch repository successfully"
+      	}
+
+      	if context.outputs.release.status == _|_ {
+      		releaseMessage: "Creating helm release"
+      	}
+      	if context.outputs.release.status != _|_ {
+      		if context.outputs.release.status.conditions[0]["message"] == "Release reconciliation succeeded" {
+      			releaseMessage: "Create helm release successfully"
+      		}
+      		if context.outputs.release.status.conditions[0]["message"] != "Release reconciliation succeeded" {
+      			releaseMessage: "Create helm release fail, message: " + context.outputs.release.status.conditions[0]["message"]
+      		}
+      	}
+
+      }
+      message: repoMessage + ", " + releaseMessage

vela-templates/addons/fluxcd/definitions/kustomize.yaml

@@ -50,6 +50,14 @@ spec:
         			  if parameter.git.branch != _|_ {
         				  ref: branch: parameter.git.branch
         			  }
+                if parameter.git.provider != _|_ {
+                  if parameter.git.provider == "GitHub" {
+                    gitImplementation: "go-git"
+                  }
+                  if parameter.git.provider == "AzureDevOps" {
+                    gitImplementation: "libgit2"
+                  }
+                }
         			  _secret
         			  _sourceCommonArgs
         		  }
@@ -204,6 +212,8 @@ spec:
         	git?: {
         		// +usage=The Git reference to checkout and monitor for changes, defaults to master branch
         		branch: string
+            // +usage=Determines which git client library to use. Defaults to GitHub, it will pick go-git. AzureDevOps will pick libgit2.
+            provider?: *"GitHub" | "AzureDevOps"
         	}
         	oss?: {
         		// +usage=The bucket's name, required if repoType is oss

vela-templates/addons/fluxcd/template.yaml

@@ -1,27 +1,35 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "Flux is a set of continuous and progressive delivery solutions for Kubernetes"
+    filter.oam.dev/annotation-keys: app.oam.dev/last-applied-configuration
   name: fluxcd
   namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: ns-flux-system
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
+  workflow:
+    steps:
+      - name: apply-ns
+        type: apply-component
+        properties:
+          component: ns-flux-system
+      - name: apply-resources
+        type: apply-remaining
+  components:
+    - name: ns-flux-system
+      type: raw
+      properties:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: flux-system
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/istio/template.yaml

@@ -1,39 +1,46 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "istio Controller is a Kubernetes Controller for manage traffic."
   name: istio
   namespace: istio-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: ns-istio-system
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: istio
-          type: helm
-          properties:
-            repoType: helm
-            url:  https://charts.kubevela.net/addons
-            chart: istio
-            version: 1.11.1
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-ns
+        type: apply-component
+        properties:
+          component: ns-istio-system
+      - name: apply-resources
+        type: apply-remaining
+  components:
+    - name: ns-istio-system
+      type: raw
+      properties:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: istio-system
+    - name: istio
+      type: helm
+      properties:
+        repoType: helm
+        url: https://charts.kubevela.net/addons
+        chart: istio
+        version: 1.11.1
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/keda/template.yaml

@@ -1,33 +1,34 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "KEDA is a Kubernetes-based Event Driven Autoscaler."
   name: keda
   namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: keda
-          type: helm
-          properties:
-            repoType: helm
-            url: https://kedacore.github.io/charts
-            chart: keda
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-resources
+        type: apply-application
+  components:
+    - name: keda
+      type: helm
+      properties:
+        repoType: helm
+        url: https://kedacore.github.io/charts
+        chart: keda
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/kruise/template.yaml

@@ -1,37 +1,38 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "Kruise is a Kubernetes extended suite for application automations"
   name: kruise
   namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: kruise
-          type: helm
-          properties:
-            repoType: git
-            url: https://github.com/openkruise/kruise
-            chart: ./charts/kruise/v0.9.0
-            git:
-              branch: master
-            values:
-              featureGates: PreDownloadImageForInPlaceUpdate=true
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-resources
+        type: apply-application
+  components:
+    - name: kruise
+      type: helm
+      properties:
+        repoType: git
+        url: https://github.com/openkruise/kruise
+        chart: ./charts/kruise/v0.9.0
+        git:
+          branch: master
+        values:
+          featureGates: PreDownloadImageForInPlaceUpdate=true
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/ns-flux-system/resource/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: flux-system

vela-templates/addons/ns-flux-system/template.yaml

@@ -1,21 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  annotations:
-    addons.oam.dev/description: "Create namespace for flux-system"
-  name: ns-flux-system
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-{{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
-{{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}

vela-templates/addons/ns-istio-system/resource/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: istio-system

vela-templates/addons/ns-istio-system/template.yaml

@@ -1,16 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  annotations:
-    addons.oam.dev/description: "Create namespace for istio-system"
-  name: ns-istio-system
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-{{ range .ResourceFiles }}
-      - name: {{ .Name }}
-        type: raw
-        properties:
-{{ .Content | indent 12 }} {{ end }}

vela-templates/addons/observability-asset/definitions/trait-import-grafana-dashboard.yaml

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

vela-templates/addons/observability-asset/definitions/trait-pure-ingress.yaml

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

vela-templates/addons/observability-asset/definitions/trait-register-grafana-datasource.yaml

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

vela-templates/addons/observability-asset/resource/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: observability

vela-templates/addons/observability-asset/template.yaml

@@ -1,21 +0,0 @@
-apiVersion: core.oam.dev/v1beta1
-kind: Initializer
-metadata:
-  annotations:
-    addons.oam.dev/description: "Preparations that observability need"
-  name: observability-asset
-  namespace: vela-system
-spec:
-  appTemplate:
-    spec:
-      components:
-{{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
-{{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}

vela-templates/addons/observability/template.yaml

@@ -1,147 +1,306 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "An out of the box solution for KubeVela observability"
   name: observability
-  namespace: observability
+  namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-ns
+        type: apply-component
+        properties:
+          component: ns-observability
+      - name: apply-trait-1
+        type: apply-component
+        properties:
+          component: import-grafana-dashboard-traitdef
+      - name: apply-trait-2
+        type: apply-component
+        properties:
+          component: pure-ingress-traitdef
+      - name: apply-trait-3
+        type: apply-component
+        properties:
+          component: register-grafana-datasource-traitdef
+      - name: apply-resources
+        type: apply-remaining
+  components:
+    - name: ns-observability
+      type: raw
+      properties:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: observability
+    - name: import-grafana-dashboard-traitdef
+      type: raw
+      properties:
         apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-    - ref:
+        kind: TraitDefinition
+        metadata:
+          annotations:
+            definition.oam.dev/description: "Import dashboards to Grafana"
+          name: import-grafana-dashboard
+          namespace: vela-system
+        spec:
+          schematic:
+            cue:
+              template: |
+                outputs: registerdatasource: {
+                	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+                	kind:       "ImportDashboard"
+                	spec: {
+                		grafana: {
+                			service:                   parameter.grafanaServiceName
+                			namespace:                 parameter.grafanaServiceNamespace
+                			credentialSecret:          parameter.credentialSecret
+                			credentialSecretNamespace: parameter.credentialSecretNamespace
+                		}
+                		urls: parameter.urls
+                	}
+                }
+                parameter: {
+                	grafanaServiceName:        string
+                	grafanaServiceNamespace:   *"default" | string
+                	credentialSecret:          string
+                	credentialSecretNamespace: *"default" | string
+                	urls: [...string]
+                }
+    - name: pure-ingress-traitdef
+      type: raw
+      properties:
         apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: observability-asset
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: grafana-registration
-          type: helm
-          properties:
-            repoType: git
-            url: https://github.com/oam-dev/grafana-registration
-            git:
-              branch: master
-            chart: ./chart
-            targetNamespace: observability
-            values:
-              replicaCount: 1
+        kind: TraitDefinition
+        metadata:
+          annotations:
+            definition.oam.dev/description: "Enable public web traffic for the component without creating a Service."
+          name: pure-ingress
+          namespace: vela-system
+        spec:
+          status:
+            customStatus: |-
+              let igs = context.outputs.ingress.status.loadBalancer.ingress
+              if igs == _|_ {
+                message: "No loadBalancer found, visiting by using 'vela port-forward " + context.appName + " --route'\n"
+              }
+              if len(igs) > 0 {
+                if igs[0].ip != _|_ {
+                  message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host + ", IP: " + igs[0].ip
+                }
+                if igs[0].ip == _|_ {
+                  message: "Visiting URL: " + context.outputs.ingress.spec.rules[0].host
+                }
+              }
+            healthPolicy: |
+              isHealth: len(context.outputs.ingress.status.loadBalancer.ingress) > 0
+          schematic:
+            cue:
+              template: |
 
-        # install Grafana
-        - name: grafana
-          properties:
-            chart: grafana
-            version: 6.14.1
-            repoType: helm
-            # original url: https://grafana.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: grafana
-          type: helm
-          traits:
-            - type: pure-ingress
-              properties:
-                domain: '[[ index .Args "grafana-domain" ]]'
-                http:
-                  "/": 80
-            - type: import-grafana-dashboard
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                urls:
-                  - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
-                  - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
-                  - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
-                  - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json # fluxcd
+                outputs: ingress: {
+                	apiVersion: "networking.k8s.io/v1beta1"
+                	kind:       "Ingress"
+                	metadata:
+                		name: context.name
+                	spec: {
+                		rules: [{
+                			host: parameter.domain
+                			http: {
+                				paths: [
+                					for k, v in parameter.http {
+                						path: k
+                						backend: {
+                							serviceName: context.name
+                							servicePort: v
+                						}
+                					},
+                				]
+                			}
+                		}]
+                	}
+                }
 
-        # install loki
-        - name: loki
-          type: helm
-          properties:
-            chart: loki-stack
-            version: 2.4.1
-            repoType: helm
-            # original url: https://grafana.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: loki
-          traits:
-            - type: register-grafana-datasource # register loki datasource to Grafana
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                name: loki
-                service: loki
-                namespace: observability
-                type: loki
-                access: proxy
+                parameter: {
+                	// +usage=Specify the domain you want to expose
+                	domain: string
 
-          # install Prometheus
-        - name: prometheus-server
-          type: helm
-          properties:
-            chart: prometheus
-            version: 14.4.1
-            repoType: helm
-            # original url: https://prometheus-community.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            releaseName: prometheus
-            values:
-              alertmanager:
-                persistentVolume:
-                  enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
-                  storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
-                  size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
-              server:
-                persistentVolume:
-                  enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
-                  storageClass: '[[ index .Args "server-pvc-class" ]]'
-                  size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
-          traits:
-            - type: register-grafana-datasource # register Prometheus datasource to Grafana
-              properties:
-                grafanaServiceName: grafana
-                grafanaServiceNamespace: observability
-                credentialSecret: grafana
-                credentialSecretNamespace: observability
-                name: prometheus
-                service: prometheus-server
-                namespace: observability
-                type: prometheus
-                access: proxy
+                	// +usage=Specify the mapping relationship between the http path and the workload port
+                	http: [string]: int
+                }
+    - name: register-grafana-datasource-traitdef
+      type: raw
+      properties:
+        apiVersion: core.oam.dev/v1beta1
+        kind: TraitDefinition
+        metadata:
+          annotations:
+            definition.oam.dev/description: "Add a datasource to Grafana"
+          name: register-grafana-datasource
+          namespace: vela-system
+        spec:
+          schematic:
+            cue:
+              template: |
+                outputs: registerdatasource: {
+                	apiVersion: "grafana.extension.oam.dev/v1alpha1"
+                	kind:       "DatasourceRegistration"
+                	spec: {
+                		grafana: {
+                			service:                   parameter.grafanaServiceName
+                			namespace:                 parameter.grafanaServiceNamespace
+                			credentialSecret:          parameter.credentialSecret
+                			credentialSecretNamespace: parameter.credentialSecretNamespace
+                		}
+                		datasource: {
+                			name:      parameter.name
+                			type:      parameter.type
+                			access:    parameter.access
+                			service:   parameter.service
+                			namespace: parameter.namespace
+                		}
+                	}
+                }
 
-        # install kube-state-metrics
-        - name: kube-state-metrics
-          type: helm
-          properties:
-            chart: kube-state-metrics
-            version: 3.4.1
-            repoType: helm
-            # original url: https://prometheus-community.github.io/helm-charts
-            url: https://charts.kubevela.net/addons
-            targetNamespace: observability
-            values:
-              image:
-                repository: oamdev/kube-state-metrics
-                tag: v2.1.0
+                parameter: {
+                	grafanaServiceName:        string
+                	grafanaServiceNamespace:   *"default" | string
+                	credentialSecret:          string
+                	credentialSecretNamespace: string
+                	name:                      string
+                	type:                      string
+                	access:                    *"proxy" | string
+                	service:                   string
+                	namespace:                 *"default" | string
+                }
 
+    - name: grafana-registration
+      type: helm
+      properties:
+        repoType: git
+        url: https://github.com/oam-dev/grafana-registration
+        git:
+          branch: master
+        chart: ./chart
+        targetNamespace: observability
+        values:
+          replicaCount: 1
+
+    # install Grafana
+    - name: grafana
+      properties:
+        chart: grafana
+        version: 6.14.1
+        repoType: helm
+        # original url: https://grafana.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: grafana
+      type: helm
+      traits:
+        - type: pure-ingress
+          properties:
+            domain: '[[ index .Args "grafana-domain" ]]'
+            http:
+              "/": 80
+        - type: import-grafana-dashboard
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            urls:
+              - https://charts.kubevela.net/addons/dashboards/kubevela_core_logging.json
+              - https://charts.kubevela.net/addons/dashboards/kubevela_core_monitoring.json
+              - https://charts.kubevela.net/addons/dashboards/kubevela_application_logging.json
+              - https://charts.kubevela.net/addons/dashboards/flux2/cluster.json # fluxcd
+
+    # install loki
+    - name: loki
+      type: helm
+      properties:
+        chart: loki-stack
+        version: 2.4.1
+        repoType: helm
+        # original url: https://grafana.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: loki
+      traits:
+        - type: register-grafana-datasource # register loki datasource to Grafana
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            name: loki
+            service: loki
+            namespace: observability
+            type: loki
+            access: proxy
+
+      # install Prometheus
+    - name: prometheus-server
+      type: helm
+      properties:
+        chart: prometheus
+        version: 14.4.1
+        repoType: helm
+        # original url: https://prometheus-community.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        releaseName: prometheus
+        values:
+          alertmanager:
+            persistentVolume:
+              enabled: '[[ index .Args "alertmanager-pvc-enabled" | default "true" ]]'
+              storageClass: '[[ index .Args "alertmanager-pvc-class" ]]'
+              size: '[[ index .Args "alertmanager-pvc-size" | default "20Gi" ]]'
+          server:
+            persistentVolume:
+              enabled: '[[ index .Args "server-pvc-enabled" | default "true" ]]'
+              storageClass: '[[ index .Args "server-pvc-class" ]]'
+              size: '[[ index .Args "server-pvc-size" | default "20Gi" ]]'
+      traits:
+        - type: register-grafana-datasource # register Prometheus datasource to Grafana
+          properties:
+            grafanaServiceName: grafana
+            grafanaServiceNamespace: observability
+            credentialSecret: grafana
+            credentialSecretNamespace: observability
+            name: prometheus
+            service: prometheus-server
+            namespace: observability
+            type: prometheus
+            access: proxy
+
+    # install kube-state-metrics
+    - name: kube-state-metrics
+      type: helm
+      properties:
+        chart: kube-state-metrics
+        version: 3.4.1
+        repoType: helm
+        # original url: https://prometheus-community.github.io/helm-charts
+        url: https://charts.kubevela.net/addons
+        targetNamespace: observability
+        values:
+          image:
+            repository: oamdev/kube-state-metrics
+            tag: v2.1.0
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/ocm-cluster-manager/resource/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: open-cluster-management

vela-templates/addons/ocm-cluster-manager/template.yaml

@@ -1,21 +1,34 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "ocm-cluster-manager can deploy an OCM hub cluster environment."
   name: ocm-cluster-manager
   namespace: vela-system
 spec:
-  appTemplate:
-    spec:
-      components:
+  workflow:
+    steps:
+      - name: apply-ns
+        type: apply-component
+        properties:
+          component: ns-open-cluster-management
+      - name: apply-resources
+        type: apply-remaining
+  components:
+    - name: ns-open-cluster-management
+      type: raw
+      properties:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: open-cluster-management
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/prometheus/template.yaml

@@ -1,28 +1,29 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "Prometheus is an open-source systems monitoring and alerting toolkit"
   name: prometheus
   namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: prometheus
-          type: helm
-          properties:
-            repoType: helm
-            url: https://prometheus-community.github.io/helm-charts
-            chart: premetheus
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-resources
+        type: apply-application
+  components:
+    - name: prometheus
+      type: helm
+      properties:
+        repoType: helm
+        url: https://prometheus-community.github.io/helm-charts
+        chart: premetheus
 {{ range .DefinitionFiles }}
         - name: {{ .Name }}
           type: raw
           properties:
-{{ .Content | indent 12 }} {{ end }}
+{{ .Content | indent 4 }} {{ end }}

vela-templates/addons/terraform-provider-alibaba/template.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud
@@ -7,47 +7,45 @@ metadata:
   name: terraform-provider-alibaba
   namespace: default
 spec:
-  appTemplate:
-    spec:
-      components:
-        - name: alibaba-account-creds
-          properties:
-            apiVersion: v1
-            kind: Secret
-            metadata:
-              name: alibaba-account-creds
+  components:
+    - name: alibaba-account-creds
+      properties:
+        apiVersion: v1
+        kind: Secret
+        metadata:
+          name: alibaba-provider-secret
+          namespace: vela-system
+        type: Opaque
+        stringData:
+          credentials: |
+            accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
+            accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
+            securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
+      type: raw
+    - name: default
+      type: raw
+      properties:
+        apiVersion: terraform.core.oam.dev/v1beta1
+        kind: Provider
+        metadata:
+          name: default
+          namespace: default
+        spec:
+          provider: alibaba
+          region: '[[ index .Args "ALICLOUD_REGION" ]]'
+          credentials:
+            source: Secret
+            secretRef:
               namespace: vela-system
-            type: Opaque
-            stringData:
-              credentials: |
-                accessKeyID: [[ index .Args "ALICLOUD_ACCESS_KEY" ]]
-                accessKeySecret: [[ index .Args "ALICLOUD_SECRET_KEY" ]]
-                securityToken: [[ index .Args "ALICLOUD_SECURITY_TOKEN" ]]
-          type: raw
-        - name: default
-          type: raw
-          properties:
-            apiVersion: terraform.core.oam.dev/v1beta1
-            kind: Provider
-            metadata:
-              name: default
-              namespace: default
-            spec:
-              provider: alibaba
-              region: '[[ index .Args "ALICLOUD_REGION" ]]'
-              credentials:
-                source: Secret
-                secretRef:
-                  namespace: vela-system
-                  name: alibaba-account-creds
-                  key: credentials
+              name: alibaba-account-creds
+              key: credentials
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/terraform-provider-azure/template.yaml

@@ -1,5 +1,5 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: Kubernetes Terraform Controller for Azure
@@ -7,47 +7,45 @@ metadata:
   name: terraform-provider-azure
   namespace: default
 spec:
-  appTemplate:
-    spec:
-      components:
-        - name: azure-account-creds
-          properties:
-            apiVersion: v1
-            kind: Secret
-            metadata:
-              name: azure-account-creds
+  components:
+    - name: azure-account-creds
+      properties:
+        apiVersion: v1
+        kind: Secret
+        metadata:
+          name: azure-account-creds
+          namespace: vela-system
+        type: Opaque
+        stringData:
+          credentials: |
+            armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
+            armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
+            armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
+            armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
+      type: raw
+    - name: azure
+      type: raw
+      properties:
+        apiVersion: terraform.core.oam.dev/v1beta1
+        kind: Provider
+        metadata:
+          name: azure
+          namespace: default
+        spec:
+          provider: azure
+          credentials:
+            source: Secret
+            secretRef:
               namespace: vela-system
-            type: Opaque
-            stringData:
-              credentials: |
-                armClientID: [[ index .Args "ARM_CLIENT_ID" ]]
-                armClientSecret: [[ index .Args "ARM_CLIENT_SECRET" ]]
-                armSubscriptionID: [[ index .Args "ARM_SUBSCRIPTION_ID" ]]
-                armTenantID: [[ index .Args "ARM_TENANT_ID" ]]
-          type: raw
-        - name: azure
-          type: raw
-          properties:
-            apiVersion: terraform.core.oam.dev/v1beta1
-            kind: Provider
-            metadata:
-              name: azure
-              namespace: default
-            spec:
-              provider: azure
-              credentials:
-                source: Secret
-                secretRef:
-                  namespace: vela-system
-                  name: azure-account-creds
-                  key: credentials
+              name: azure-account-creds
+              key: credentials
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/addons/terraform/definitions/terraform-azure-database-mariadb.yaml

@@ -22,13 +22,13 @@ spec:
         }
 
         resource "azurerm_resource_group" "example" {
-          name = "tfex-mariadb-database-RG"
-          location = "West Europe"
+          name = var.resource_group
+          location = var.location
         }
 
         resource "azurerm_mariadb_server" "example" {
-          name = "mariadb-svr-sample"
-          location = azurerm_resource_group.example.location
+          name = var.server_name
+          location = var.location
           resource_group_name = azurerm_resource_group.example.name
 
           sku_name = "B_Gen5_2"
@@ -44,15 +44,21 @@ spec:
         }
 
         resource "azurerm_mariadb_database" "example" {
-          name = var.name
+          name = var.db_name
           resource_group_name = azurerm_resource_group.example.name
           server_name = azurerm_mariadb_server.example.name
           charset = "utf8"
           collation = "utf8_general_ci"
         }
 
-        variable "name" {
-          default = "mariadb_database"
+        variable "server_name" {
+          type = string
+          description = "mariadb server name"
+          default = "mariadb-svr-sample"
+        }
+
+        variable "db_name" {
+          default = "backend"
           type = string
           description = "Database instance name"
         }
@@ -68,6 +74,41 @@ spec:
           type = string
           description = "Database instance password"
         }
+
+        variable "location" {
+          description = "Azure location"
+          type = string
+          default = "West Europe"
+        }
+
+        variable "resource_group" {
+          description = "Resource group"
+          type = string
+          default = "kubevela-group"
+        }
+
+        output "SERVER_NAME" {
+          value = var.server_name
+        }
+
+        output "DB_NAME" {
+          value = var.db_name
+        }
+        output "DB_USER" {
+          value = var.username
+        }
+        output "DB_PASSWORD" {
+          sensitive = true
+          value = var.password
+        }
+        output "DB_PORT" {
+          value = "3306"
+        }
+        output "DB_HOST" {
+          value = azurerm_mariadb_server.example.fqdn
+        }
+
+
       providerRef:
         name: azure
         namespace: default

vela-templates/addons/terraform/resource/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: terraform-system

vela-templates/addons/terraform/template.yaml

@@ -1,34 +1,46 @@
 apiVersion: core.oam.dev/v1beta1
-kind: Initializer
+kind: Application
 metadata:
   annotations:
     addons.oam.dev/description: "Terraform Controller is a Kubernetes Controller for Terraform."
   name: terraform
   namespace: vela-system
 spec:
-  dependsOn:
-    - ref:
-        apiVersion: core.oam.dev/v1beta1
-        kind: Initializer
-        name: fluxcd
-        namespace: vela-system
-  appTemplate:
-    spec:
-      components:
-        - name: terraform-controller
-          type: helm
-          properties:
-            repoType: helm
-            url: https://charts.kubevela.net/addons
-            chart: terraform-controller
-            version: 0.1.19
+  workflow:
+    steps:
+      - name: checking-depends-on
+        type: depends-on-app
+        properties:
+          name: fluxcd
+          namespace: vela-system
+      - name: apply-ns
+        type: apply-component
+        properties:
+          component: ns-terraform-system
+      - name: apply-resources
+        type: apply-remaining
+  components:
+    - name: ns-terraform-system
+      type: raw
+      properties:
+        apiVersion: v1
+        kind: Namespace
+        metadata:
+          name: terraform-system
+    - name: terraform-controller
+      type: helm
+      properties:
+        repoType: helm
+        url: https://charts.kubevela.net/addons
+        chart: terraform-controller
+        version: 0.1.19
 {{ range .ResourceFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}
 {{ range .DefinitionFiles }}
-        - name: {{ .Name }}
-          type: raw
-          properties:
-{{ .Content | indent 12 }} {{ end }}
+    - name: {{ .Name }}
+      type: raw
+      properties:
+{{ .Content | indent 8 }} {{ end }}

vela-templates/definitions/internal/export2config.cue

@@ -0,0 +1,36 @@
+import (
+	"vela/op"
+)
+
+"export2config": {
+	type: "workflow-step"
+	annotations: {}
+	labels: {}
+	description: "Export data to config map for your workflow steps"
+}
+template: {
+	apply: op.#Apply & {
+		value: {
+			apiVersion: "v1"
+			kind:       "ConfigMap"
+			metadata: {
+				name: parameter.configName
+				if parameter.namespace != _|_ {
+					namespace: parameter.namespace
+				}
+				if parameter.namespace == _|_ {
+					namespace: context.namespace
+				}
+			}
+			data: parameter.data
+		}
+	}
+	parameter: {
+		// +usage=Specify the name of the config map
+		configName: string
+		// +usage=Specify the namespace of the config map
+		namespace?: string
+		// +usage=Specify the data of config map
+		data: {}
+	}
+}

vela-templates/definitions/internal/export2secret.cue

@@ -0,0 +1,41 @@
+import (
+	"vela/op"
+)
+
+"export2secret": {
+	type: "workflow-step"
+	annotations: {}
+	labels: {}
+	description: "Export data to secret for your workflow steps"
+}
+template: {
+	apply: op.#Apply & {
+		value: {
+			apiVersion: "v1"
+			kind:       "Secret"
+			if parameter.type != _|_ {
+				type: parameter.type
+			}
+			metadata: {
+				name: parameter.secretName
+				if parameter.namespace != _|_ {
+					namespace: parameter.namespace
+				}
+				if parameter.namespace == _|_ {
+					namespace: context.namespace
+				}
+			}
+			stringData: parameter.data
+		}
+	}
+	parameter: {
+		// +usage=Specify the name of the secret
+		secretName: string
+		// +usage=Specify the namespace of the secret
+		namespace?: string
+		// +usage=Specify the type of the secret
+		type?: string
+		// +usage=Specify the data of secret
+		data: {}
+	}
+}

vela-templates/definitions/internal/read-object.cue

@@ -0,0 +1,52 @@
+import (
+	"vela/op"
+)
+
+"read-object": {
+	type: "workflow-step"
+	annotations: {}
+	labels: {}
+	description: "Read objects for your workflow steps"
+}
+template: {
+	output: {
+		if parameter.apiVersion == _|_ && parameter.kind == _|_ {
+			op.#Read & {
+				value: {
+					apiVersion: "core.oam.dev/v1beta1"
+					kind:       "Application"
+					metadata: {
+						name: parameter.name
+						if parameter.namespace != _|_ {
+							namespace: parameter.namespace
+						}
+					}
+				}
+			}
+		}
+		if parameter.apiVersion != _|_ || parameter.kind != _|_ {
+			op.#Read & {
+				value: {
+					apiVersion: parameter.apiVersion
+					kind:       parameter.kind
+					metadata: {
+						name: parameter.name
+						if parameter.namespace != _|_ {
+							namespace: parameter.namespace
+						}
+					}
+				}
+			}
+		}
+	}
+	parameter: {
+		// +usage=Specify the apiVersion of the object, defaults to core.oam.dev/v1beta1
+		apiVersion?: string
+		// +usage=Specify the kind of the object, defaults to Application
+		kind?: string
+		// +usage=Specify the name of the object
+		name: string
+		// +usage=Specify the namespace of the object
+		namespace?: string
+	}
+}

vela-templates/definitions/internal/task.cue

@@ -21,6 +21,10 @@ template: {
 					name:  context.name
 					image: parameter.image
 
+					if parameter["imagePullPolicy"] != _|_ {
+						imagePullPolicy: parameter.imagePullPolicy
+					}
+
 					if parameter["cmd"] != _|_ {
 						command: parameter.cmd
 					}
@@ -83,6 +87,13 @@ template: {
 						}}]
 				}
 
+				if parameter["imagePullSecrets"] != _|_ {
+					imagePullSecrets: [ for v in parameter.imagePullSecrets {
+						name: v
+					},
+					]
+				}
+
 			}
 		}
 	}
@@ -96,6 +107,12 @@ template: {
 		// +short=i
 		image: string
 
+		// +usage=Specify image pull policy for your service
+		imagePullPolicy?: string
+
+		// +usage=Specify image pull secrets for your service
+		imagePullSecrets?: [...string]
+
 		// +usage=Define the job restart policy, the value can only be Never or OnFailure. By default, it's Never.
 		restart: *"Never" | string
 

vela-templates/definitions/internal/webhook-notification.cue

@@ -1,5 +1,6 @@
 import (
 	"vela/op"
+	"encoding/base64"
 )
 
 "webhook-notification": {
@@ -12,7 +13,13 @@ template: {
 
 	parameter: {
 		dingding?: {
-			url: string
+			url: {
+				address?: string
+				fromSecret?: {
+					name: string
+					key:  string
+				}
+			}
 			message: {
 				text?: *null | {
 					content: string
@@ -57,7 +64,13 @@ template: {
 		}
 
 		slack?: {
-			url: string
+			url: {
+				address?: string
+				fromSecret?: {
+					name: string
+					key:  string
+				}
+			}
 			message: {
 				text:         string
 				blocks?:      *null | [...block]
@@ -122,20 +135,62 @@ template: {
 	}
 
 	// send webhook notification
-	ding: {
+	ding: op.#Steps & {
 		if parameter.dingding != _|_ {
-			op.#DingTalk & {
-				message: parameter.dingding.message
-				dingUrl: parameter.dingding.url
+			if parameter.dingding.url.address != _|_ {
+				ding1: op.#DingTalk & {
+					message: parameter.dingding.message
+					dingUrl: parameter.dingding.url.address
+				}
+			}
+			if parameter.dingding.url.fromSecret != _|_ && parameter.dingding.url.address == _|_ {
+				read: op.#Read & {
+					value: {
+						apiVersion: "v1"
+						kind:       "Secret"
+						metadata: {
+							name:      parameter.dingding.url.fromSecret.name
+							namespace: context.namespace
+						}
+					}
+				}
+
+				decoded:     base64.Decode(null, read.value.data[parameter.dingding.url.fromSecret.key])
+				stringValue: op.#ConvertString & {bt: decoded}
+				ding2:       op.#DingTalk & {
+					message: parameter.dingding.message
+					dingUrl: stringValue.str
+				}
 			}
 		}
 	}
 
-	slack: {
+	slack: op.#Steps & {
 		if parameter.slack != _|_ {
-			op.#Slack & {
-				message:  parameter.slack.message
-				slackUrl: parameter.slack.url
+			if parameter.slack.url.address != _|_ {
+				slack1: op.#Slack & {
+					message:  parameter.slack.message
+					slackUrl: parameter.slack.url.address
+				}
+			}
+			if parameter.slack.url.fromSecret != _|_ && parameter.slack.url.address == _|_ {
+				read: op.#Read & {
+					value: {
+						kind:       "Secret"
+						apiVersion: "v1"
+						metadata: {
+							name:      parameter.slack.url.fromSecret.name
+							namespace: context.namespace
+						}
+					}
+				}
+
+				decoded:     base64.Decode(null, read.value.data[parameter.slack.url.fromSecret.key])
+				stringValue: op.#ConvertString & {bt: decoded}
+				slack2:      op.#Slack & {
+					message:  parameter.slack.message
+					slackUrl: stringValue.str
+				}
 			}
 		}
 	}

vela-templates/gen_addons.go

@@ -43,11 +43,11 @@ import (
 )
 
 const (
-	// InitializerTemplateName represents the Initializer template file of addons
-	InitializerTemplateName = "template.yaml"
+	// TemplateName represents the Application template file of addons
+	TemplateName = "template.yaml"
 
-	// InitializerFileDir is where we store generated initializer & component definition
-	InitializerFileDir = "auto-gen"
+	// ApplicationFileDir is where we store generated application & component definition
+	ApplicationFileDir = "auto-gen"
 
 	// ComponentDefDir is where we store correspond componentDefinition for addon
 	ComponentDefDir = "definitions"
@@ -64,7 +64,7 @@ const (
 	// ChartTemplateNamespace is placeholder for helm chart
 	ChartTemplateNamespace = "{{.Values.systemDefinitionNamespace}}"
 
-	// NameAnnotation marked the addon's name if exist, or initializer's name
+	// NameAnnotation marked the addon's name if exist, or application's name
 	NameAnnotation = "addons.oam.dev/name"
 )
 
@@ -96,7 +96,7 @@ func walkAllAddons(path string) ([]string, error) {
 
 	addons := make([]string, 0, len(files))
 	for _, file := range files {
-		if file.IsDir() && file.Name() != InitializerFileDir {
+		if file.IsDir() && file.Name() != ApplicationFileDir {
 			addons = append(addons, file.Name())
 		}
 	}
@@ -141,7 +141,7 @@ func getAddonInfo(addon string, addonsPath string) (*AddonInfo, error) {
 	resourcesFiles := make([]velaFile, 0)
 	defFiles := make([]velaFile, 0)
 	addInfo := &AddonInfo{
-		TemplatePath: filepath.Join(addonRoot, InitializerTemplateName),
+		TemplatePath: filepath.Join(addonRoot, TemplateName),
 	}
 	// raw resources directory
 	if pathExist(resourceRoot) {
@@ -180,7 +180,7 @@ func WriteToFile(filename string, data string) error {
 	return file.Sync()
 }
 
-func generateInitializer(addon *AddonInfo) (*v1beta1.Initializer, error) {
+func generateApplication(addon *AddonInfo) (*v1beta1.Application, error) {
 	templatePath := strings.Split(addon.TemplatePath, "/")
 	templateName := templatePath[len(templatePath)-1]
 	t, err := template.New(templateName).Funcs(sprig.TxtFuncMap()).ParseFiles(addon.TemplatePath)
@@ -190,15 +190,16 @@ func generateInitializer(addon *AddonInfo) (*v1beta1.Initializer, error) {
 	var buf bytes.Buffer
 	err = t.Execute(&buf, addon)
 	if err != nil {
-		return nil, errors.Wrapf(err, "generate Initializer %s fail", addon.TemplatePath)
+		fmt.Println(err)
+		return nil, errors.Wrapf(err, "generate Application %s fail", addon.TemplatePath)
 	}
 
-	init := new(v1beta1.Initializer)
-	err = yaml.Unmarshal(buf.Bytes(), init)
+	app := new(v1beta1.Application)
+	err = yaml.Unmarshal(buf.Bytes(), app)
 	if err != nil {
 		return nil, err
 	}
-	return init, err
+	return app, err
 }
 
 func setConfigMapLabels(addonInfo *AddonInfo) map[string]string {
@@ -212,7 +213,8 @@ func setConfigMapAnnotations(addonInfo *AddonInfo) map[string]string {
 		DescAnnotation: addonInfo.Description,
 	}
 }
-func removeTimestampInplace(s *string) {
+
+func removeUselessInplace(s *string) {
 	timeStampwithApptemplate := "appTemplate:\n(.*metadata:)?\n[ ]*creationTimestamp: null"
 	re := regexp.MustCompile(timeStampwithApptemplate)
 	*s = re.ReplaceAllString(*s, "appTemplate:")
@@ -220,61 +222,65 @@ func removeTimestampInplace(s *string) {
 	pureTimeStamp := "\n[ ]*creationTimestamp: null"
 	re = regexp.MustCompile(pureTimeStamp)
 	*s = re.ReplaceAllString(*s, "")
+
+	nullProperties := "\n[ ]*properties: null"
+	re = regexp.MustCompile(nullProperties)
+	*s = re.ReplaceAllString(*s, "")
 }
 
 // storeConfigMap store configMap in helm chart
-func storeConfigMap(addonInfo *AddonInfo, initializer *v1beta1.Initializer, storePath string) error {
+func storeConfigMap(addonInfo *AddonInfo, application *v1beta1.Application, storePath string) error {
 	configMap := &corev1.ConfigMap{
 		TypeMeta: v1.TypeMeta{
 			APIVersion: "v1",
 			Kind:       "ConfigMap",
 		},
 	}
-	addonInfo.Description = initializer.GetAnnotations()[DescAnnotation]
+	addonInfo.Description = application.GetAnnotations()[DescAnnotation]
 	configMap.SetName(addonInfo.StoreName)
 	configMap.SetNamespace(ChartTemplateNamespace)
 	configMap.SetAnnotations(setConfigMapAnnotations(addonInfo))
 	configMap.SetLabels(setConfigMapLabels(addonInfo))
 
 	data := make(map[string]string, 1)
-	initContent, err := yaml.Marshal(initializer)
+	initContent, err := yaml.Marshal(application)
 	if err != nil {
 		return err
 	}
-	data["initializer"] = string(initContent)
+	data["application"] = string(initContent)
 	configMap.Data = data
 	content, err := yaml.Marshal(configMap)
 	if err != nil {
 		return err
 	}
 	raw := string(content)
-	removeTimestampInplace(&raw)
+	removeUselessInplace(&raw)
 	raw = strings.ReplaceAll(raw, fmt.Sprintf("'%s'", ChartTemplateNamespace), ChartTemplateNamespace)
 	filename := storePath + "/" + addonInfo.StoreName + ".yaml"
 	return WriteToFile(filename, raw)
 }
 
-// storeInitializer store init in one file for apply directly
-func storeInitializer(init *v1beta1.Initializer, addonPath string, addonName string) error {
-	initContent, err := yaml.Marshal(init)
+// storeApplication store app in one file for apply directly
+func storeApplication(app *v1beta1.Application, addonPath string, addonName string) error {
+	initContent, err := yaml.Marshal(app)
 	if err != nil {
 		return err
 	}
 
-	filename := path.Join(addonPath, InitializerFileDir, addonName+".yaml")
+	filename := path.Join(addonPath, ApplicationFileDir, addonName+".yaml")
 	contents := string(initContent)
-	removeTimestampInplace(&contents)
+	removeUselessInplace(&contents)
 	return WriteToFile(filename, contents)
 }
 
-func storeDefaultAddon(init *v1beta1.Initializer, storePath, addonName string) error {
-	init.SetNamespace(ChartTemplateNamespace)
+func storeDefaultAddon(app *v1beta1.Application, storePath, addonName string) error {
+	app.SetNamespace(ChartTemplateNamespace)
 
-	init.SetAnnotations(util.MergeMapOverrideWithDst(init.Annotations, map[string]string{
+	app.SetAnnotations(util.MergeMapOverrideWithDst(app.Annotations, map[string]string{
 		"helm.sh/hook": "post-install, post-upgrade, pre-delete",
 	}))
 
-	initContent, err := yaml.Marshal(init)
+	initContent, err := yaml.Marshal(app)
 	if err != nil {
 		return err
 	}
@@ -282,9 +288,10 @@ func storeDefaultAddon(init *v1beta1.Initializer, storePath, addonName string) e
 	filename := path.Join(storePath, addonName+".yaml")
 	raw := string(initContent)
 	raw = strings.ReplaceAll(raw, fmt.Sprintf("'%s'", ChartTemplateNamespace), ChartTemplateNamespace)
-	removeTimestampInplace(&raw)
+	removeUselessInplace(&raw)
 	return WriteToFile(filename, raw)
 }
+
 func main() {
 	var addonsPath string
 	var configMapStorePath string
@@ -292,12 +299,12 @@ func main() {
 
 	flag.StringVar(&addonsPath, "addons-path", "./vela-templates/addons", "addons path")
 	flag.StringVar(&configMapStorePath, "store-path", "./charts/vela-core/templates/addons", "path store configMap")
-	flag.StringVar(&initStorePath, "init-path", "./charts/vela-core/templates/addons-default", "path to store default addon")
+	flag.StringVar(&initStorePath, "app-path", "./charts/vela-core/templates/addons-default", "path to store default addon")
 
 	addons, err := walkAllAddons(addonsPath)
 	dealErr := func(addonName string, err error) {
 		if err != nil {
-			fmt.Printf("%s gen_addon err:%e", addonName, err)
+			fmt.Printf("%s gen_addon err:%+v", addonName, err)
 			os.Exit(1)
 		}
 	}
@@ -308,26 +315,26 @@ func main() {
 	for _, addon := range addons {
 		addInfo, err := getAddonInfo(addon, addonsPath)
 		dealErr(addon, err)
-		init, err := generateInitializer(addInfo)
+		app, err := generateApplication(addInfo)
 		dealErr(addon, err)
-		setAddonName(addInfo, init)
-		err = storeInitializer(init, addonsPath, addInfo.StoreName)
+		setAddonName(addInfo, app)
+		err = storeApplication(app, addonsPath, addInfo.StoreName)
 		dealErr(addon, err)
-		err = storeConfigMap(addInfo, init, configMapStorePath)
+		err = storeConfigMap(addInfo, app, configMapStorePath)
 		dealErr(addon, err)
 		if slices.Contains(DefaultEnableAddons, addon) {
-			err = storeDefaultAddon(init, initStorePath, addon)
+			err = storeDefaultAddon(app, initStorePath, addon)
 			dealErr(addon, err)
 		}
 	}
 }
 
-func setAddonName(addInfo *AddonInfo, init *v1beta1.Initializer) {
+func setAddonName(addInfo *AddonInfo, app *v1beta1.Application) {
 	var name string
-	if val, ok := init.Annotations[NameAnnotation]; ok {
+	if val, ok := app.Annotations[NameAnnotation]; ok {
 		name = val
 	} else {
-		name = init.Name
+		name = app.Name
 	}
 	addInfo.Name = name
 	addInfo.StoreName = cli.TransAddonName(name)