diff --git a/charts/library-chart/Chart.yaml b/charts/library-chart/Chart.yaml index 7befc57e8ba0e631308b135d850c9bc6a83c0d61..9ed1e44a1f74cf642607b8474019d5fb09a981a0 100644 --- a/charts/library-chart/Chart.yaml +++ b/charts/library-chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: library-chart -version: 1.3.5 +version: 1.3.6 type: library diff --git a/charts/library-chart/templates/_configmap.tpl b/charts/library-chart/templates/_configmap.tpl index e09533de7b0cfc3a29f2ed00a1ba96f0749f229b..f4f5e107b8695df4a0da32110a2e10700d6af9aa 100644 --- a/charts/library-chart/templates/_configmap.tpl +++ b/charts/library-chart/templates/_configmap.tpl @@ -269,6 +269,44 @@ metadata: data: spark-defaults.conf: | {{- include "library-chart.sparkConf" . | nindent 4 }} + {{- if .Values.repository.mavenRepository -}} + {{ printf "spark.jars.ivySettings /opt/spark/conf/ivysettings.xml" }} + {{- end }} +{{- end }} +{{- end }} + + + +{{/* ConfigMap for Ivy Settings (custom maven repository for Spark) */}} +{{- define "library-chart.ivySettings" -}} +{{ printf "<ivysettings>" }} +{{ printf "<settings defaultResolver=\"custom_maven_repository\"/>" | indent 4 }} +{{ printf "<resolvers>" | indent 4 }} +{{ printf "<ibiblio name=\"custom_maven_repository\" m2compatible=\"true\" root=\"%s\"/>" .Values.repository.mavenRepository | indent 8 }} +{{ printf "</resolvers>" | indent 4 }} +{{ printf "</ivysettings>" }} +{{- end -}} + +{{/* Create the name of the config map Ivy Settings to use */}} +{{- define "library-chart.configMapNameIvySettings" -}} +{{- if and (.Values.spark.default) (.Values.repository.mavenRepository) }} +{{- $name:= (printf "%s-configmapivysettings" (include "library-chart.fullname" .) ) }} +{{- $name }} +{{- end }} +{{- end }} + +{{/* Template to generate a ConfigMap for Ivy Settings */}} +{{- define "library-chart.configMapIvySettings" -}} +{{- if and (.Values.spark.default) (.Values.repository.mavenRepository) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "library-chart.configMapNameIvySettings" . }} + labels: + {{- include "library-chart.labels" . | nindent 4 }} +data: + ivysettings.xml: | + {{- include "library-chart.ivySettings" . | nindent 4 }} {{- end }} {{- end }}