From 5e5f3ece1f403e18133279831519ec2f0b9b2491 Mon Sep 17 00:00:00 2001
From: maany <imptodefeat@gmail.com>
Date: Tue, 2 Jul 2024 17:02:35 +0200
Subject: [PATCH] webui: add hostPathMounts, additionalEnvs

hostPathMounts can be used to mount CA chains/CRL's directly from host nodes

additionalEnvs can be used to supply any additional environment variables required by the webui container that may not be configured directly via the helm chart
---
 charts/rucio-webui/Chart.yaml                |  2 +-
 charts/rucio-webui/templates/deployment.yaml | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/charts/rucio-webui/Chart.yaml b/charts/rucio-webui/Chart.yaml
index 96864d9..52e741f 100644
--- a/charts/rucio-webui/Chart.yaml
+++ b/charts/rucio-webui/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-webui
-version: 34.0.4
+version: 34.0.5
 apiVersion: v1
 description: A Helm chart to deploy the new Rucio Webui
 keywords:
diff --git a/charts/rucio-webui/templates/deployment.yaml b/charts/rucio-webui/templates/deployment.yaml
index 536c275..e0b8674 100644
--- a/charts/rucio-webui/templates/deployment.yaml
+++ b/charts/rucio-webui/templates/deployment.yaml
@@ -75,6 +75,15 @@ spec:
         persistentVolumeClaim:
           claimName: {{ $val.name }}
       {{- end}}
+      {{- range $collection := tuple .Values.hostPathMounts }}
+      {{- range $key, $val := $collection }}
+      - name: {{ $val.volumeName | default (printf "a%s" ($val.mountPath | sha1sum)) }}
+        hostPath:
+          {{- if $val.type }}
+          type: {{ $val.type }}
+          {{- end}}
+          path: {{ $val.hostPath }}
+      {{- end}}
       containers:
       {{- if .Values.config.logs.exposeHttpdLogs }}
         - name: httpd-error-log
@@ -131,6 +140,13 @@ spec:
               mountPath: {{ $val.mountPath }}
               subPath: {{ $val.subPath }}
             {{- end}}
+            {{- range $collection := tuple .Values.hostPathMounts }}
+            {{- range $key, $val := $collection }}
+            - name: {{ $val.volumeName | default (printf "a%s" ($val.mountPath | sha1sum)) }}
+              mountPath: {{ $val.mountPath }}
+              readOnly: {{ $val.readOnly | default false }}
+            {{- end}}
+            {{- end}}
             {{- range $key, $val := .Values.persistentVolumes }}
             - name: {{ $key }}
               mountPath: {{ $val.mountPath }}
@@ -177,6 +193,9 @@ spec:
             - name: RUCIO_WEBUI_ENABLE_SSL
               value: "True"
           {{- end }}
+{{- with .Values.additionalEnvs }}
+{{ toYaml . | indent 12 }}
+{{- end}}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
 {{- with .Values.imagePullSecrets }}