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
rucio · Jul 2, 2024 · 24a17eb · 24a17eb
1 parent 7a9c35b
commit 24a17eb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git 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
@@ -75,6 +75,16 @@ 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}}
+      {{- end}}
       containers:
       {{- if .Values.config.logs.exposeHttpdLogs }}
         - name: httpd-error-log
@@ -131,6 +141,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 +194,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 }}