fix: custom ca secret key for legacy job templates

kubeshop · Sep 26, 2024 · 9225496 · 9225496
1 parent 50ae7bb
commit 9225496
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/charts/testkube-api/templates/_job-container-template.yaml.tpl b/charts/testkube-api/templates/_job-container-template.yaml.tpl
@@ -62,7 +62,7 @@ spec:
         - name: {{`{{ .RunnerCustomCASecret }}`}}
           mountPath: /etc/testkube/certs/testkube-custom-ca.pem
           readOnly: true
-          subPath: ca.crt
+          subPath: {{ .Values.cloud.tls.customCaSecretKey }}
         {{`{{- end }}`}}
         {{`{{- if .ArtifactRequest }}`}}
           {{`{{- if and .ArtifactRequest.VolumeMountPath (or .ArtifactRequest.StorageClassName .ArtifactRequest.UseDefaultStorageClassName) }}`}}
@@ -164,7 +164,7 @@ spec:
         - name: {{`{{ .RunnerCustomCASecret }}`}}
           mountPath: /etc/testkube/certs/testkube-custom-ca.pem
           readOnly: true
-          subPath: ca.crt
+          subPath: {{ .Values.cloud.tls.customCaSecretKey }}
         {{`{{- end }}`}}
         {{`{{- end }}`}}
         {{- with .Values.additionalJobVolumeMounts }}

diff --git a/charts/testkube-api/templates/_job-scraper-template.yaml.tpl b/charts/testkube-api/templates/_job-scraper-template.yaml.tpl
@@ -83,7 +83,7 @@ spec:
           - name: {{`{{ .RunnerCustomCASecret }}`}}
             mountPath: /etc/testkube/certs/testkube-custom-ca.pem
             readOnly: true
-            subPath: ca.crt
+            subPath: {{ .Values.cloud.tls.customCaSecretKey }}
         {{`{{- end }}`}}
         {{`{{- if or .ArtifactRequest .AgentAPITLSSecret }}`}}
           {{`{{- if .ArtifactRequest.VolumeMountPath }}`}}

diff --git a/charts/testkube-api/templates/_job-template.yaml.tpl b/charts/testkube-api/templates/_job-template.yaml.tpl
@@ -55,7 +55,7 @@ spec:
         - name: {{`{{ .RunnerCustomCASecret }}`}}
           mountPath: /etc/testkube/certs/testkube-custom-ca.pem
           readOnly: true
-          subPath: ca.crt
+          subPath: {{ .Values.cloud.tls.customCaSecretKey }}
         {{`{{- end }}`}}
         {{`{{- if .ArtifactRequest }}`}}
           {{`{{- if and .ArtifactRequest.VolumeMountPath (or .ArtifactRequest.StorageClassName .ArtifactRequest.UseDefaultStorageClassName) }}`}}
@@ -152,7 +152,7 @@ spec:
         - name: {{`{{ .RunnerCustomCASecret }}`}}
           mountPath: /etc/testkube/certs/testkube-custom-ca.pem
           readOnly: true
-          subPath: ca.crt
+          subPath: {{ .Values.cloud.tls.customCaSecretKey }}
         {{`{{- end }}`}}
         {{`{{- if .AgentAPITLSSecret }}`}}
         - mountPath: /tmp/agent-cert

diff --git a/charts/testkube-api/templates/_slave-pod-template.yaml.tpl b/charts/testkube-api/templates/_slave-pod-template.yaml.tpl
@@ -52,7 +52,7 @@ spec:
     - name: {{`{{ .RunnerCustomCASecret }}`}}
       mountPath: /etc/testkube/certs/testkube-custom-ca.pem
       readOnly: true
-      subPath: ca.crt
+      subPath: {{ .Values.cloud.tls.customCaSecretKey }}
     {{`{{- end }}`}}
     {{`{{- if .ArtifactRequest }}`}}
       {{`{{- if and .ArtifactRequest.VolumeMountPath (or .ArtifactRequest.StorageClassName .ArtifactRequest.UseDefaultStorageClassName) }}`}}