From 23e23602acb9aaecb7cc4cb3dac21b534561e6ee Mon Sep 17 00:00:00 2001
From: nicufk <nicolae@kubeshop.io>
Date: Tue, 16 Apr 2024 18:27:50 +0300
Subject: [PATCH] fix: add registry configuration for workflows doecker images

---
 charts/testkube-api/templates/_helpers.tpl    | 47 +++++++++++++++++++
 charts/testkube-api/templates/deployment.yaml |  4 ++
 charts/testkube-api/values.yaml               | 10 ++++
 charts/testkube/values.yaml                   | 18 +++++++
 4 files changed, 79 insertions(+)

diff --git a/charts/testkube-api/templates/_helpers.tpl b/charts/testkube-api/templates/_helpers.tpl
index 937974e1b..b0e852330 100644
--- a/charts/testkube-api/templates/_helpers.tpl
+++ b/charts/testkube-api/templates/_helpers.tpl
@@ -93,6 +93,53 @@ Define API image
 {{- end -}}
 {{- end -}}
 
+{{/*
+Define Test Workflows Toolkit Image
+*/}}
+{{- define "testkube-tw-toolkit.image" -}}
+{{- $registryName := .Values.imageWorkflows.registry -}}
+{{- $repositoryName := .Values.imageWorkflows.repositoryToolkit -}}
+{{- $tag := default .Chart.AppVersion .Values.imageWorkflows.tag | toString -}}
+{{- $separator := ":" -}}
+{{- if .Values.imageWorkflows.digest }}
+    {{- $separator = "@" -}}
+    {{- $tag = .Values.imageWorkflows.digest | toString -}}
+{{- end -}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s%s%s" .Values.global.imageRegistry $repositoryName $separator $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $tag -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Define Test Workflows Init Image
+*/}}
+{{- define "testkube-tw-init.image" -}}
+{{- $registryName := .Values.imageWorkflows.registry -}}
+{{- $repositoryName := .Values.imageWorkflows.repositoryInit -}}
+{{- $tag := default .Chart.AppVersion .Values.imageWorkflows.tag | toString -}}
+{{- $separator := ":" -}}
+{{- if .Values.imageWorkflows.digest }}
+    {{- $separator = "@" -}}
+    {{- $tag = .Values.imageWorkflows.digest | toString -}}
+{{- end -}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s%s%s" .Values.global.imageRegistry $repositoryName $separator $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $tag -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Define TESTKUBE_WATCHER_NAMESPACES variable
 */}}
diff --git a/charts/testkube-api/templates/deployment.yaml b/charts/testkube-api/templates/deployment.yaml
index f14cd23c9..f11dc850a 100644
--- a/charts/testkube-api/templates/deployment.yaml
+++ b/charts/testkube-api/templates/deployment.yaml
@@ -414,6 +414,10 @@ spec:
             {{- end }}
             - name: TESTKUBE_DEFAULT_STORAGE_CLASS_NAME
               value: "{{ .Values.defaultStorageClassName }}"
+            - name: TESTKUBE_TW_TOOLKIT_IMAGE
+              value: "{{ include "testkube-tw-toolkit.image" . }}"
+            - name: TESTKUBE_TW_INIT_IMAGE
+              value: "{{ include "testkube-tw-init.image" . }}"
           image: {{ include "testkube-api.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
index e146cda02..01b06aa15 100644
--- a/charts/testkube-api/values.yaml
+++ b/charts/testkube-api/values.yaml
@@ -52,6 +52,16 @@ image:
   digest: ""
   pullSecret: []
 
+imageWorkflows:
+  registry: docker.io
+  repositoryToolkit: kubeshop/testkube-tw-toolkit
+  repositoryInit: kubeshop/testkube-tw-init
+  pullPolicy: IfNotPresent
+  ## Overrides the image tag whose default is the chart appVersion.
+  # tag: "1.7.24"
+  digest: ""
+  pullSecret: []
+
 ## Chart parameters
 ## nameOverride Overrides Chart name
 ## fullnameOverride Full name that overrides Chart name
diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml
index 9b52fb419..5cbc95520 100644
--- a/charts/testkube/values.yaml
+++ b/charts/testkube/values.yaml
@@ -355,6 +355,24 @@ testkube-api:
     digest: ""
     # -- Testkube API k8s secret for private registries
     pullSecrets: []
+
+  # Test Workflows image parameters
+  imageWorkflows:
+    # -- Test Workflows image registry
+    registry: docker.io
+    # -- Test Workflows image name
+    repositoryToolkit: kubeshop/testkube-tw-toolkit
+    # -- Test Workflows init image name
+    repositoryInit: kubeshop/testkube-tw-init
+    # Overrides the image tag whose default is the chart appVersion.
+    # tag: "latest"
+    # -- Test Workflows image tag
+    pullPolicy: IfNotPresent
+    # -- Test Workflows image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag
+    digest: ""
+    # -- Test Workflows image k8s secret for private registries
+    pullSecrets: []
+  
   # -- Extra environment variables to be set on deployment
   extraEnvVars: []
   #  - name: FOO