Add static admin data to bundler deployment

DiamondLightSource · Oct 10, 2024 · 89ad232 · 89ad232
1 parent e241157
commit 89ad232
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 2 deletions.
diff --git a/charts/bundler/Chart.yaml b/charts/bundler/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: bundler
 description: A Open Policy Agent (OPA) Data Bundle Server providing permissionable data from ISPyB
 type: application
-version: 0.2.1
-appVersion: 0.0.11
+version: 0.3.0
+appVersion: 0.0.12
 maintainers:
   - name: garryod
     email: "garry.o'donnell@diamond.ac.uk"

diff --git a/charts/bundler/static/admin.json b/charts/bundler/static/admin.json
@@ -0,0 +1,35 @@
+{
+    "em_admin": ["m01", "m02", "m03", "m04", "m05", "m06", "m07", "m08", "m09", "m10", "m11", "m12", "m13", "m14", "m15"],
+    "epsic_admin": ["e01", "e02", "e03"],
+    "gen_admin": [],
+    "pow_admin": [],
+    "mx_admin": ["i02-1", "i02-2", "i03", "i04", "i04-1", "i23", "i24"],
+    "saxs_admin": ["b21", "i22", "p38"],
+    "sm_admin": [],
+    "tomo_admin": [],
+    "xpdf_admin": ["i15", "i15-1"],
+
+    "b07_admin": ["b07"],
+    "b16_admin": ["b16"],
+    "b18_admin": ["b18"],
+    "b22_admin": ["b22"],
+    "b23_admin": ["b23"],
+    "b24_admin": ["b24"],
+    "i05_admin": ["i05"],
+    "i06_admin": ["i06"],
+    "i07_admin": ["i07"],
+    "i08_admin": ["i08"],
+    "i09_admin": ["i09"],
+    "i10_admin": ["i10"],
+    "i11_admin": ["i11"],
+    "i12_admin": ["i12"],
+    "i13_admin": ["i13"],
+    "i14_admin": ["i14"],
+    "i16_admin": ["i16"],
+    "i18_admin": ["i18"],
+    "i20_admin": ["i20"],
+    "i21_admin": ["i21"],
+    "k11_admin": ["k11"],
+    "p45_admin": ["p45"],
+    "p99_admin": ["p99"]
+}
diff --git a/charts/bundler/templates/deployment.yaml b/charts/bundler/templates/deployment.yaml
@@ -54,6 +54,8 @@ spec:
                   key: {{ .Values.bundler.requireTokenSecret.key }}
             - name: BUNDLER_POLLING_INTERVAL
               value: {{ .Values.bundler.pollingInterval }}
+            - name: BUNDLER_STATIC_DATA
+              value: /srv/bundler/{{ .Values.bundler.staticDataPattern }}
           ports:
             - name: http
               containerPort: 80
@@ -68,6 +70,13 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: static-bundler-volume
+              mountPath: /srv/bundler/
+      volumes:
+        - name: static-bundler-volume
+          configMap:
+            name: {{ include "common.names.fullname" . }}-static-data
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/bundler/templates/static_config.yaml b/charts/bundler/templates/static_config.yaml
@@ -0,0 +1,15 @@
+{{ if .Values.bundler.staticDataPattern -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-static-data
+  namespace: {{ .Release.Namespace }}
+data:
+  {{ range $path, $_ := .Files.Glob .Values.bundler.staticDataPattern -}}
+  {{ $data := $.Files.Get $path -}}
+  {{ if  (trim $data) -}}
+  {{ $path }}: |-
+    {{- $data | nindent 4 }}
+  {{ end -}}
+  {{- end -}}
+{{- end }}
diff --git a/charts/bundler/values.yaml b/charts/bundler/values.yaml
@@ -20,6 +20,7 @@ bundler:
     name: token-authorization
     key: bearer
   pollingInterval: 60s
+  staticDataPattern: "static/*.json"
 
 serviceAccount:
   create: true