feat: make it possible to pass YAML string as a global template (#985)

kubeshop · Feb 3, 2025 · 8f2a339 · 8f2a339
1 parent 372981b
commit 8f2a339
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/charts/testkube-api/templates/deployment.yaml b/charts/testkube-api/templates/deployment.yaml
@@ -203,7 +203,11 @@ spec:
             {{- if .Values.global.testWorkflows.globalTemplate.enabled }}
             {{- if .Values.global.testWorkflows.globalTemplate.inline }}
             - name: TESTKUBE_GLOBAL_WORKFLOW_TEMPLATE_INLINE
+              {{- if and .Values.global.testWorkflows.globalTemplate.spec (kindIs "map" .Values.global.testWorkflows.globalTemplate.spec) }}
               value: {{ toJson .Values.global.testWorkflows.globalTemplate.spec | quote }}
+              {{- else }}
+              value: {{ toJson (fromYaml .Values.global.testWorkflows.globalTemplate.spec) | quote }}
+              {{- end }}
             {{- else }}
             - name: TESTKUBE_GLOBAL_WORKFLOW_TEMPLATE_NAME
               value: "{{ .Values.global.testWorkflows.globalTemplate.name }}"

diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
@@ -40,7 +40,7 @@ global:
       external: false
       inline: false
       name: global-template
-      spec: {}
+      spec: null
 
 ### @section Common parameters
 ## Kubernetes version (using Helm capabilities if not set)

diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml
@@ -65,7 +65,7 @@ global:
       # -- Should the global template sourced inline instead of CRD? (otherwise its resource is created from spec below)
       inline: false
       # -- Specification for the global template
-      spec: {}
+      spec: null
       # spec:
       #   pod:
       #     imagePullSecrets: