get independent targetPort value from port value in service (#123)

InseeFrLab · Jan 29, 2024 · c9d3e69 · c9d3e69
1 parent a02430f
commit c9d3e69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 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.19
+version: 1.5.20
 type: library
diff --git a/charts/library-chart/templates/_service.tpl b/charts/library-chart/templates/_service.tpl
@@ -15,23 +15,27 @@ spec:
   {{- end }}
   ports:
     - port: {{ .Values.networking.service.port }}
-      targetPort: {{ .Values.networking.service.port }}
+      targetPort: {{ default .Values.networking.service.port .Values.networking.service.targetPort }}
       protocol: TCP
       name: main
+    {{ if .Values.networking.user }}
     {{ if .Values.networking.user.enabled }}
     - port: {{ .Values.networking.user.port }}
       targetPort: {{ .Values.networking.user.port }}
       protocol: TCP
       name: user
     {{- end }}
+    {{- end }}
     {{ if .Values.spark }}
     {{ if .Values.spark.sparkui }}
+    {{ if .Values.networking.sparkui }}
     - port: {{ .Values.networking.sparkui.port }}
       targetPort: {{ .Values.networking.sparkui.port }}
       protocol: TCP
       name: sparkui
     {{- end }}
     {{- end }}
+    {{- end }}
   selector:
     {{- include "library-chart.selectorLabels" . | nindent 4 }}
 {{- end }}