Add support for multibox

Aidbox · Aug 5, 2024 · 790d2df · 790d2df
1 parent 06b6ba8
commit 790d2df
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/aidbox/Chart.yaml b/aidbox/Chart.yaml
@@ -5,4 +5,4 @@ home: https://www.health-samurai.io/aidbox
 icon: https://aidbox.github.io/helm-charts/icon.png?1712669999
 name: aidbox
 type: application
-version: 0.1.12
+version: 0.1.13
diff --git a/aidbox/README.md b/aidbox/README.md
@@ -2,7 +2,7 @@
 
 [Aidbox](https://docs.aidbox.app/) is an efficient and scalable FHIR server built to handle healthcare data effectively, empowering healthcare providers and developers alike with its comprehensive platform for storing, accessing, and exchanging healthcare information in accordance with FHIR standards.
 
-![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
+![Version: 0.1.13](https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
 
 ## Installation
 

diff --git a/aidbox/templates/configmap.yaml b/aidbox/templates/configmap.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "aidbox.labels" . | nindent 4 }}
 data:
   {{- range $key, $val := .Values.config }}
-  {{- if and (ne $key "PGUSER") (ne $key "PGPASSWORD") (ne $key "AIDBOX_CLIENT_ID") (ne $key "AIDBOX_CLIENT_SECRET") (ne $key "AIDBOX_ADMIN_ID") (ne $key "AIDBOX_ADMIN_PASSWORD") (ne $key "AIDBOX_LICENSE") (ne $key "AIDBOX_FHIR_VERSION") (ne $key "PGHOST") (ne $key "PGPORT") (ne $key "AIDBOX_PORT") (ne $key "PGDATABASE") (ne $key "AIDBOX_ES_AUTH") (ne $key "AIDBOX_FHIR_SCHEMA_VALIDATION") }}
+  {{- if and (ne $key "PGUSER") (ne $key "PGPASSWORD") (ne $key "AIDBOX_CLIENT_ID") (ne $key "AIDBOX_CLIENT_SECRET") (ne $key "AIDBOX_ADMIN_ID") (ne $key "AIDBOX_ADMIN_PASSWORD") (ne $key "AIDBOX_LICENSE") (ne $key "AIDBOX_FHIR_VERSION") (ne $key "PGHOST") (ne $key "PGPORT") (ne $key "AIDBOX_PORT") (ne $key "PGDATABASE") (ne $key "AIDBOX_ES_AUTH") (ne $key "AIDBOX_FHIR_SCHEMA_VALIDATION") (ne $key "AIDBOX_CLUSTER_SECRET") (ne $key "AIDBOX_SUPERUSER") }}
   {{ $key }}: {{ $val | quote }}
   {{- end }}
   {{- end }}

diff --git a/aidbox/templates/secrets.yaml b/aidbox/templates/secrets.yaml
@@ -6,12 +6,14 @@ metadata:
     {{- include "aidbox.labels" . | nindent 4 }}
 data:
   {{- with .Values.config }}
-  AIDBOX_ADMIN_ID: {{ .AIDBOX_ADMIN_ID | b64enc }}
-  AIDBOX_ADMIN_PASSWORD: {{ .AIDBOX_ADMIN_PASSWORD | b64enc }}
-  AIDBOX_CLIENT_ID: {{ .AIDBOX_CLIENT_ID | b64enc }}
-  AIDBOX_CLIENT_SECRET: {{ .AIDBOX_CLIENT_SECRET | b64enc }}
-  {{if .AIDBOX_ES_AUTH }}AIDBOX_ES_AUTH: {{ .AIDBOX_ES_AUTH | b64enc }}{{ end }}
-  AIDBOX_LICENSE: {{ .AIDBOX_LICENSE | b64enc }}
-  PGUSER: {{ .PGUSER | b64enc }}
-  PGPASSWORD: {{ .PGPASSWORD | b64enc }}
+  AIDBOX_ADMIN_ID: {{ required "AIDBOX_ADMIN_ID is required" .AIDBOX_ADMIN_ID | b64enc }}
+  AIDBOX_ADMIN_PASSWORD: {{ required "AIDBOX_ADMIN_PASSWORD is required" .AIDBOX_ADMIN_PASSWORD | b64enc }}
+  AIDBOX_CLIENT_ID: {{ required "AIDBOX_CLIENT_ID is required" .AIDBOX_CLIENT_ID | b64enc }}
+  AIDBOX_CLIENT_SECRET: {{ required "AIDBOX_CLIENT_SECRET is required" .AIDBOX_CLIENT_SECRET | b64enc }}
+  {{ if .AIDBOX_CLUSTER_SECRET }}AIDBOX_CLUSTER_SECRET: {{ .AIDBOX_CLUSTER_SECRET | b64enc }}{{ end }}
+  {{ if .AIDBOX_SUPERUSER }}AIDBOX_SUPERUSER: {{ .AIDBOX_SUPERUSER | b64enc }}{{ end }}
+  {{ if .AIDBOX_ES_AUTH }}AIDBOX_ES_AUTH: {{ .AIDBOX_ES_AUTH | b64enc }}{{ end }}
+  AIDBOX_LICENSE: {{ required "AIDBOX_LICENSE is required" .AIDBOX_LICENSE | b64enc }}
+  PGUSER: {{ required "PGUSER is required" .PGUSER | b64enc }}
+  PGPASSWORD: {{ required "PGPASSWORD is required" .PGPASSWORD | b64enc }}
   {{- end }}