From ab15f24511576ef622fc4fe98fbef9a3ee52ed29 Mon Sep 17 00:00:00 2001
From: ed382 <174873053+ed382@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:27:47 +0200
Subject: [PATCH] feat: ability to specify custom ca secret key (#939)

---
 charts/testkube-api/templates/deployment.yaml | 2 +-
 charts/testkube-api/values.yaml               | 4 +++-
 charts/testkube/values.yaml                   | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/testkube-api/templates/deployment.yaml b/charts/testkube-api/templates/deployment.yaml
index 3c563bf09..5aaaa1c88 100644
--- a/charts/testkube-api/templates/deployment.yaml
+++ b/charts/testkube-api/templates/deployment.yaml
@@ -261,7 +261,7 @@ spec:
             - mountPath: /etc/testkube/certs/testkube-custom-ca.pem
               name: {{ .Values.cloud.tls.customCaSecretRef }}
               readOnly: true
-              subPath: ca.crt
+              subPath: {{ .Values.cloud.tls.customCaSecretKey }}
             {{- end }}
             {{- with .Values.additionalVolumeMounts }}
             {{- toYaml . | nindent 12 -}}
diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
index 7788ddc64..e9597a767 100644
--- a/charts/testkube-api/values.yaml
+++ b/charts/testkube-api/values.yaml
@@ -145,8 +145,10 @@ cloud:
     enabled: true
     ## Toggle should the client skip verifying the Agent API server cert in Cloud/Enterprise
     skipVerify: false
-    ## If specified, injects a custom CA into the list of trusted CAs. Specify a secret with the PEM encoded CA under the ca.crt key.
+    ## If specified, injects a custom CA into the list of trusted CAs. Specify a secret with the PEM encoded CA under the key specified by customCaSecretKey.
     customCaSecretRef: ""
+    ## Specify the key for the PEM encoded CA in the secret specified by customCaSecretRef.
+    customCaSecretKey: "ca.crt"
     # -- Specifies the path to the directory (skip the trailing slash) where CA certificates should be mounted. The mounted file should container a PEM encoded CA certificate.
     customCaDirPath: ""
     certificate:
diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml
index 4205937d3..e3cdea195 100644
--- a/charts/testkube/values.yaml
+++ b/charts/testkube/values.yaml
@@ -506,8 +506,10 @@ testkube-api:
       enabled: true
       # -- Toggle should the client skip verifying the Agent API server cert in Cloud/Enterprise
       skipVerify: false
-      ## If specified, injects a custom CA into the list of trusted CAs. Specify a secret with the PEM encoded CA under the ca.crt key.
+      ## If specified, injects a custom CA into the list of trusted CAs. Specify a secret with the PEM encoded CA under the key specified by customCaSecretKey.
       customCaSecretRef: ""
+      ## Specify the key for the PEM encoded CA in the secret specified by customCaSecretRef.
+      customCaSecretKey: "ca.crt"
       # -- Specifies the path to the directory (skip the trailing slash) where CA certificates should be mounted. The mounted file should container a PEM encoded CA certificate.
       customCaDirPath: ""
       certificate: