From 96a4178d109d6cf8aef9a99641a6f5a2b81e6736 Mon Sep 17 00:00:00 2001 From: Dawid Rusnak Date: Thu, 26 Sep 2024 15:38:24 +0200 Subject: [PATCH 1/3] feat: add support for external global template --- charts/testkube-api/README.md | 1 + .../testworkflows/builtin-templates/global-template.yaml | 2 +- charts/testkube/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/testkube-api/README.md b/charts/testkube-api/README.md index 1aadf9383..85d8b8cc8 100644 --- a/charts/testkube-api/README.md +++ b/charts/testkube-api/README.md @@ -84,6 +84,7 @@ A Helm chart for Testkube api | global.testWorkflows.createOfficialTemplates | bool | `true` | | | global.testWorkflows.createServiceAccountTemplates | bool | `true` | | | global.testWorkflows.globalTemplate.enabled | bool | `false` | | +| global.testWorkflows.globalTemplate.external | bool | `false` | | | global.testWorkflows.globalTemplate.name | string | `"global-template"` | | | global.testWorkflows.globalTemplate.spec | object | `{}` | | | global.tls.caCertPath | string | `""` | | diff --git a/charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml b/charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml index 8815865ee..b86294caf 100644 --- a/charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml +++ b/charts/testkube-api/templates/testworkflows/builtin-templates/global-template.yaml @@ -1,4 +1,4 @@ -{{- if .Values.global.testWorkflows.globalTemplate.enabled }} +{{- if and .Values.global.testWorkflows.globalTemplate.enabled (not .Values.global.testWorkflows.globalTemplate.external) }} apiVersion: testworkflows.testkube.io/v1 kind: TestWorkflowTemplate metadata: diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml index 7e81ba113..58b47b776 100644 --- a/charts/testkube/values.yaml +++ b/charts/testkube/values.yaml @@ -56,6 +56,8 @@ global: enabled: false # -- Name of the global template name: global-template + # -- Is the global template sourced externally? (otherwise it's created from spec below) + external: false # -- Specification for the global template spec: {} # spec: From 778406336b824b1eafba44ba9adc9e9bd2dd0cd8 Mon Sep 17 00:00:00 2001 From: Dawid Rusnak Date: Thu, 26 Sep 2024 15:46:00 +0200 Subject: [PATCH 2/3] fix: add missing default value to testkube-api --- charts/testkube-api/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml index e9597a767..bde32576b 100644 --- a/charts/testkube-api/values.yaml +++ b/charts/testkube-api/values.yaml @@ -33,6 +33,7 @@ global: createOfficialTemplates: true globalTemplate: enabled: false + external: false name: global-template spec: {} From 95c0aa9cae940d5d1e90d6e9c14e8e159cf8e8fd Mon Sep 17 00:00:00 2001 From: Dawid Rusnak Date: Thu, 26 Sep 2024 15:47:33 +0200 Subject: [PATCH 3/3] chore: add globalTemplate.external to testkube chart README docs --- charts/testkube/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/testkube/README.md b/charts/testkube/README.md index 0d23c2ea2..254c2c408 100644 --- a/charts/testkube/README.md +++ b/charts/testkube/README.md @@ -163,6 +163,7 @@ kubectl label --overwrite crds scripts.tests.testkube.io app.kubernetes.io/manag | global.testWorkflows.globalTemplate | object | `{"enabled":false,"name":"global-template","spec":{}}` | Global TestWorkflowTemplate that will be automatically included for all executions | | global.testWorkflows.globalTemplate.enabled | bool | `false` | Is global template enabled | | global.testWorkflows.globalTemplate.name | string | `"global-template"` | Name of the global template | +| global.testWorkflows.globalTemplate.external | bool | `false` | Is the global template sourced externally? (otherwise it's created from spec below) | | global.testWorkflows.globalTemplate.spec | object | `{}` | Specification for the global template | | global.tls.caCertPath | string | `""` | Path to the PEM-encoded CA certificate file (needs to be mounted to the container previously) | | global.tolerations | list | `[{"effect":"NoSchedule","key":"kubernetes.io/arch","operator":"Equal","value":"arm64"}]` | Tolerations to add to all deployed pods |