From 8973d0f1a817a81653b571eb564e3977e351d8df Mon Sep 17 00:00:00 2001
From: Marco Vito Moscaritolo <mavimo@gmail.com>
Date: Mon, 11 Dec 2023 22:36:41 +0100
Subject: [PATCH] fix(agent): [SMAGENT-6037] fix the template failure for helm
 3.9

---
 charts/agent/Chart.yaml               |  2 +-
 charts/agent/templates/configmap.yaml | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
index dab4a26cb..4c1af9f92 100644
--- a/charts/agent/Chart.yaml
+++ b/charts/agent/Chart.yaml
@@ -30,4 +30,4 @@ sources:
 - https://app.sysdigcloud.com/#/settings/user
 - https://github.com/draios/sysdig
 type: application
-version: 1.19.2
+version: 1.19.3
diff --git a/charts/agent/templates/configmap.yaml b/charts/agent/templates/configmap.yaml
index 288cfa883..67988ea90 100644
--- a/charts/agent/templates/configmap.yaml
+++ b/charts/agent/templates/configmap.yaml
@@ -37,14 +37,21 @@ data:
   Checking here the user is using Custom CA and if http_proxy.ssl = true
   If these conditions are true, then we use the agent.sslCaFileName for the http_proxy.ca_certificate
 */}}
-{{- if and (eq (include "sysdig.custom_ca.enabled"  (dict "global" .Values.global.ssl "component" .Values.ssl)) "true") (.Values.sysdig.settings) (hasKey .Values.sysdig.settings "http_proxy") (hasKey (default dict .Values.sysdig.settings.http_proxy) "ssl") (eq (get (default (dict "ssl" false) .Values.sysdig.settings.http_proxy) "ssl") true) }}
-  {{- $baseSettings := .Values.sysdig.settings -}}
-  {{- $caFilePath := printf "%s%s" "/etc/ca-certs/" (include "sysdig.custom_ca.keyName"  (dict "global" .Values.global.ssl "component" .Values.ssl)) }}
-  {{- $mergedSettings := mergeOverwrite $baseSettings (dict "http_proxy" (dict "ca_certificate" $caFilePath)) -}}
-  {{ toYaml $mergedSettings | nindent 4 }}
-{{- else if .Values.sysdig.settings }}
-  {{ toYaml .Values.sysdig.settings | nindent 4 }}
+{{- if and (eq (include "sysdig.custom_ca.enabled" (dict "global" .Values.global.ssl "component" .Values.ssl)) "true") }}
+  {{- if (hasKey .Values.sysdig.settings "http_proxy") }}
+    {{- if (hasKey .Values.sysdig.settings.http_proxy "ssl") }}
+      {{- if (.Values.sysdig.settings.http_proxy.ssl) }}
+        {{- $baseSettings := .Values.sysdig.settings -}}
+        {{- $caFilePath := printf "%s%s" "/etc/ca-certs/" (include "sysdig.custom_ca.keyName"  (dict "global" .Values.global.ssl "component" .Values.ssl)) }}
+        {{- $mergedSettings := mergeOverwrite $baseSettings (dict "http_proxy" (dict "ca_certificate" $caFilePath)) -}}
+        {{ toYaml $mergedSettings | nindent 4 }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
 {{- end }}
+{{- if .Values.sysdig.settings }}
+  {{ toYaml .Values.sysdig.settings | nindent 4 }}
+{{ end }}
 {{- if .Values.leaderelection.enable }}
     k8s_delegation_election: true
     k8s_coldstart: