Allow cube.json and storage.json to be configured

FNNDSC · Mar 28, 2024 · 2f64c07 · 2f64c07
1 parent ca0d703
commit 2f64c07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/charts/chris/Chart.yaml b/charts/chris/Chart.yaml
@@ -17,7 +17,7 @@ keywords:
 icon: ./logo_chris.png
 
 type: application
-version: "0.10.1"
+version: "0.10.2"
 appVersion: "5.0.0"
 
 maintainers:

diff --git a/charts/chris/templates/pfdcm/pfdcm-config.yml b/charts/chris/templates/pfdcm/pfdcm-config.yml
@@ -44,8 +44,10 @@ metadata:
     kubernetes.io/description: "Configuration of the CUBE and PACS this PFDCM speaks to"
 stringData:
   {{- /* cube.json and storage.json are both blank, because the related functionality is now handled by oxidicom. */}}
-  cube.json: "{}"
-  storage.json: "{}"
+  cube.json: |
+    {{ .Values.pfdcm.additionalConfig.cube | toJson | default "{}" }}
+  storage.json: |
+    {{ .Values.pfdcm.additionalConfig.storage | toJson | default "{}" }}
   pacs.json: |
     {
       "services": {{ include "pfdcm.localOrthanc" . | fromYaml | merge .Values.pfdcm.additionalConfig.pacs.services | toPrettyJson | nindent 8 }}