From 1286024d80cc6ba1f692b9e8477e0c74e44bb708 Mon Sep 17 00:00:00 2001
From: Jirka Kremser <535866+jkremser@users.noreply.github.com>
Date: Tue, 2 Jul 2024 12:51:25 +0200
Subject: [PATCH] Comment out new option in helm values, because it breaks the
 old versions of keda (the cmd arg does not exist for them), this way the
 default value is still correctly applied for new keda version because they
 have the fallback implemented also in the golang code (#659)

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>
---
 keda/templates/manager/deployment.yaml | 4 +++-
 keda/values.yaml                       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml
index 43980b59..7751fef1 100644
--- a/keda/templates/manager/deployment.yaml
+++ b/keda/templates/manager/deployment.yaml
@@ -103,9 +103,11 @@ spec:
           {{- if .Values.profiling.operator.enabled }}
           - "--profiling-bind-address=:{{ .Values.profiling.operator.port }}"
           {{- end }}
-          {{- range .Values.certificates.operator.caDirs }}
+          {{- with (.Values.certificates.operator).caDirs }}
+          {{- range . }}
           - "--ca-dir={{ . }}"
           {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.extraArgs.keda }}
           - "--{{ $key }}={{ $value }}"
           {{- end }}
diff --git a/keda/values.yaml b/keda/values.yaml
index 4c76edc6..380439c2 100644
--- a/keda/values.yaml
+++ b/keda/values.yaml
@@ -817,8 +817,8 @@ certificates:
       group: cert-manager.io
   operator:
     # -- Location(s) of CA files for authentication of external TLS connections such as TLS-enabled metrics sources
-    caDirs:
-    - /custom/ca
+    # caDirs:
+    # - /custom/ca
 
 permissions:
   metricServer: