Merge pull request #162 from phlg/fix_spark_proxy

[library-chart] Partial rollback of Spark proxy exceptions
InseeFrLab · Oct 8, 2024 · 38ab3f7 · 38ab3f7
2 parents d84bea3 + 69f5bfb
commit 38ab3f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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 }}