From 69f5bfb47912231063d10e76613c73ba9f537b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Lagard=C3=A8re?= <philippe.lagardere@insee.fr>
Date: Tue, 8 Oct 2024 09:03:57 +0200
Subject: [PATCH] fix: partial rollback of Spark proxy exceptions

(kept the change to testing .Values.proxy.enabled instead of .Values.proxy)
---
 charts/library-chart/Chart.yaml            | 2 +-
 charts/library-chart/templates/_secret.tpl | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/charts/library-chart/Chart.yaml b/charts/library-chart/Chart.yaml
index 0fd4a31e..40743375 100644
--- a/charts/library-chart/Chart.yaml
+++ b/charts/library-chart/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: library-chart
-version: 1.5.25
+version: 1.5.26
 type: library
diff --git a/charts/library-chart/templates/_secret.tpl b/charts/library-chart/templates/_secret.tpl
index caa8ab0c..87d710f3 100644
--- a/charts/library-chart/templates/_secret.tpl
+++ b/charts/library-chart/templates/_secret.tpl
@@ -395,12 +395,9 @@ Flag to disable certificate checking for Spark
 
 {{/* Build a spark (or java) oriented non proxy hosts list from the linux based noProxy variable */}}
 {{- if (.Values.proxy).enabled -}}
-{{- if .Values.proxy.httpProxy }}
-{{- printf " -Dhttp.nonProxyHosts=%v" .Values.proxy.httpProxy }}
-{{- end }}
-{{- if .Values.proxy.httpsProxy }}
-{{- printf " -Dhttps.nonProxyHosts=%v" .Values.proxy.httpsProxy }}
-{{- end }}
+{{- $nonProxyHosts := regexReplaceAllLiteral "\\|\\." (regexReplaceAllLiteral "^(\\.)" (replace "," "|" (default "localhost" .Values.proxy.noProxy))  "*.") "|*." -}}
+{{- printf " -Dhttp.nonProxyHosts=%v" $nonProxyHosts }}
+{{- printf " -Dhttps.nonProxyHosts=%v" $nonProxyHosts }}
 {{- end -}}
 
 {{- end }}