Refactor: refactor Helm chart with unnecessary 'systemDefinitionNames` value (#3267)

* refactor: refactor Helm chart with unnecessary 'systemDefinitionNamespace' value

* Revert "refactor: refactor Helm chart with unnecessary 'systemDefinitionNamespace' value"

This reverts commit 2ae764737f.

* Fix: Helm chart's 'Values.systemDefinitionNamespace' have default value of '.Release.Namespace' if unspecified.

* fix: fixed vela cli  referenced '{{.Values.systemDefinitionNamespace}}'

Co-authored-by: yungcheng.tyc <yungcheng.tyc@alibaba-inc.com>

charts/vela-core/templates/_helpers.tpl

@@ -66,3 +66,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+systemDefinitionNamespace value defaulter
+*/}}
+{{- define "systemDefinitionNamespace" -}}
+{{- if .Values.systemDefinitionNamespace -}}
+    {{ .Values.systemDefinitionNamespace }}
+{{- else -}}
+    {{ .Release.Namespace }}
+{{- end -}}
+{{- end -}}

charts/vela-core/templates/addon_registry.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: vela-addon-registry
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 data:
   registries: '{
   "KubeVela":{

charts/vela-core/templates/definitions/autodetect.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     definition.oam.dev/description: "autodetects.core.oam.dev is the default workload type of ComponentDefinition"
   name: autodetects.core.oam.dev
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   definitionRef:
     name: autodetects.core.oam.dev

charts/vela-core/templates/definitions/healthscopes.yaml

@@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: ScopeDefinition
 metadata:
   name: healthscopes.core.oam.dev
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   workloadRefsPath: spec.workloadRefs
   allowComponentOverlap: true

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-core/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-object
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: configmap
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: depends-on-app
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-core/templates/defwithtemplate/deploy-cloud-resource.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy cloud resource and bind secret to clusters
   name: deploy-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy env binding component to target env
   name: deploy2env
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Provides differentiated configuration and environment scheduling policies for application.
   name: env-binding
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: env
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2config
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: expose
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Enable public web traffic for the component, the ingress API matches K8s v1.20+.
   name: gateway
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Apply periodical health checking to the application.
   name: health
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   manageHealthCheck: true
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-core/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: import-grafana-dashboard
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

charts/vela-core/templates/defwithtemplate/ingress-1-20.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: ingress-1-20
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: ingress
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

charts/vela-core/templates/defwithtemplate/k8s-objects.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: K8s-objects allow users to specify raw K8s objects in properties
   name: k8s-objects
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: labels
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: lifecycle
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: nocalhost
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-core/templates/defwithtemplate/node-affinity.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: node-affinity
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Send message to webhook
   name: notification
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-core/templates/defwithtemplate/pure-ingress.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: pure-ingress
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: pvc
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: raw
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: read-object
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-core/templates/defwithtemplate/register-grafana-datasource.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: register-grafana-datasource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Manually scale K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: scaler
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Specify serviceAccount for your workload which follows the pod spec in path 'spec.template'.
   name: service-account
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: service-binding
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-core/templates/defwithtemplate/share-cloud-resource.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
   name: share-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: sidecar
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Add storages on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: storage
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Suspend your workflow
   name: suspend
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Describes jobs that run code or a script to completion.
   name: task
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: volumes
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: webhook-notification
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Send webhook request to the url
   name: webhook
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -6,7 +6,7 @@ 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.
   name: webservice
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: worker
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -125,7 +125,7 @@ spec:
             {{ if ne .Values.disableCaps "" }}
             - "--disable-caps={{ .Values.disableCaps }}"
             {{ end }}
-            - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
+            - "--system-definition-namespace={{ include "systemDefinitionNamespace" . }}"
             - "--application-revision-limit={{ .Values.applicationRevisionLimit }}"
             - "--definition-revision-limit={{ .Values.definitionRevisionLimit }}"
             - "--oam-spec-ver={{ .Values.OAMSpecVer }}"

charts/vela-core/templates/test/test-application.yaml

@@ -5,7 +5,7 @@ metadata:
     helm.sh/hook: test-success
     helm.sh/hook-delete-policy: hook-succeeded
   name: helm-test-vela-app
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   components:
     - name: helm-test-express-server
@@ -24,7 +24,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ .Release.Name }}-application-test"
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
   annotations:
     "helm.sh/hook": test
     helm.sh/hook-delete-policy: hook-succeeded
@@ -44,16 +44,16 @@ spec:
           echo "Waiting application is ready..."
 
           echo "waiting for application being Ready"
-          kubectl -n {{.Values.systemDefinitionNamespace}} wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
+          kubectl -n {{ include "systemDefinitionNamespace" . }} wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
           echo "application is Ready"
 
           # wait for deploy being created
           echo "waiting for deployment being available"
-          kubectl -n {{.Values.systemDefinitionNamespace}} wait --for=condition=available deployments helm-test-express-server --timeout 3m
+          kubectl -n {{ include "systemDefinitionNamespace" . }} wait --for=condition=available deployments helm-test-express-server --timeout 3m
           echo "deployment being available"
 
           # wait for ingress being created
-          while ! [ `kubectl -n {{.Values.systemDefinitionNamespace}} get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
+          while ! [ `kubectl -n {{ include "systemDefinitionNamespace" . }} get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
             echo "waiting for ingress being created"
             sleep 1
           done

charts/vela-core/templates/velaql/endpoints.yaml

@@ -2,7 +2,7 @@ apiVersion: "v1"
 kind:       "ConfigMap"
 metadata: 
   name:      "service-endpoints-view"
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 data:
   template: |
       import (

charts/vela-core/values.yaml

@@ -91,7 +91,8 @@ logFilePath: ""
 #If the value is 0, the maximum file size is unlimited.
 logFileMaxSize: 1024
 
-systemDefinitionNamespace: vela-system
+#System definition namespace, if unspecified, will use built-in variable `.Release.Namespace`.
+systemDefinitionNamespace:
 
 applicationRevisionLimit: 10
 

charts/vela-minimal/templates/_helpers.tpl

@@ -66,3 +66,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+systemDefinitionNamespace value defaulter
+*/}}
+{{- define "systemDefinitionNamespace" -}}
+{{- if .Values.systemDefinitionNamespace -}}
+    {{ .Values.systemDefinitionNamespace }}
+{{- else -}}
+    {{ .Release.Namespace }}
+{{- end -}}
+{{- end -}}

charts/vela-minimal/templates/definitions/autodetect.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     definition.oam.dev/description: "autodetects.core.oam.dev is the default workload type of ComponentDefinition"
   name: autodetects.core.oam.dev
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   definitionRef:
     name: autodetects.core.oam.dev

charts/vela-minimal/templates/definitions/healthscopes.yaml

@@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1beta1
 kind: ScopeDefinition
 metadata:
   name: healthscopes.core.oam.dev
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   workloadRefsPath: spec.workloadRefs
   allowComponentOverlap: true

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: annotations
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-minimal/templates/defwithtemplate/apply-application-in-parallel.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application-in-parallel
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-application
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-object
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: apply-remaining
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-minimal/templates/defwithtemplate/bind-cloud-resource.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters
   name: bind-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: configmap
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: cpuscaler
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: depends-on-app
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-minimal/templates/defwithtemplate/deploy-cloud-resource.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Deploy cloud resource and bind secret to clusters
   name: deploy-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: deploy2runtime
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: env
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2config
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: export2secret
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: expose
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Enable public web traffic for the component, the ingress API matches K8s v1.20+.
   name: gateway
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Apply periodical health checking to the application.
   name: health
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   manageHealthCheck: true
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: hostalias
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-minimal/templates/defwithtemplate/import-grafana-dashboard.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: import-grafana-dashboard
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

charts/vela-minimal/templates/defwithtemplate/ingress-1-20.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: ingress-1-20
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: ingress
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   podDisruptive: false
   schematic:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: init-container
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

charts/vela-minimal/templates/defwithtemplate/k8s-objects.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: K8s-objects allow users to specify raw K8s objects in properties
   name: k8s-objects
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: labels
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: lifecycle
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: nocalhost
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-minimal/templates/defwithtemplate/node-affinity.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: node-affinity
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Send message to webhook
   name: notification
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-minimal/templates/defwithtemplate/pure-ingress.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: pure-ingress
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: pvc
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/deprecated: "true"
   name: raw
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: read-object
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

charts/vela-minimal/templates/defwithtemplate/register-grafana-datasource.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: register-grafana-datasource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads: []
   conflictsWith: []

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Manually scale K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: scaler
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Specify serviceAccount for your workload which follows the pod spec in path 'spec.template'.
   name: service-account
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: service-binding
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

charts/vela-minimal/templates/defwithtemplate/share-cloud-resource.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Sync secrets created by terraform component to runtime clusters so that runtime clusters can share the created cloud resource.
   name: share-cloud-resource
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue:

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

@@ -8,7 +8,7 @@ metadata:
   labels:
     custom.definition.oam.dev/ui-hidden: "true"
   name: sidecar
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - '*'

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Add storages on K8s pod for your workload which follows the pod spec in path 'spec.template'.
   name: storage
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   appliesToWorkloads:
     - deployments.apps

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

@@ -6,7 +6,7 @@ metadata:
   annotations:
     definition.oam.dev/description: Suspend your workflow
   name: suspend
-  namespace: {{.Values.systemDefinitionNamespace}}
+  namespace: {{ include "systemDefinitionNamespace" . }}
 spec:
   schematic:
     cue: