Remove require from Aidbox secrets

Aidbox · May 17, 2024 · 4ded1d4 · 4ded1d4
1 parent b6607a3
commit 4ded1d4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 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.7
+version: 0.1.8
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.7](https://img.shields.io/badge/Version-0.1.7-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.8](https://img.shields.io/badge/Version-0.1.8-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/secrets.yaml b/aidbox/templates/secrets.yaml
@@ -6,12 +6,12 @@ metadata:
     {{- include "aidbox.labels" . | nindent 4 }}
 data:
   {{- with .Values.config }}
-  AIDBOX_ADMIN_ID: {{ required "missing AIDBOX_ADMIN_ID value" .AIDBOX_ADMIN_ID | b64enc }}
-  AIDBOX_ADMIN_PASSWORD: {{ required "missing AIDBOX_ADMIN_PASSWORD value" .AIDBOX_ADMIN_PASSWORD | b64enc }}
-  AIDBOX_CLIENT_ID: {{ required "missing AIDBOX_CLIENT_ID value" .AIDBOX_CLIENT_ID | b64enc }}
-  AIDBOX_CLIENT_SECRET: {{ required "missing AIDBOX_CLIENT_SECRET value" .AIDBOX_CLIENT_SECRET | b64enc }}
+  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: {{ required "missing AIDBOX_LICENSE value" .AIDBOX_LICENSE | b64enc }}
-  PGUSER: {{ required "missing PGUSER value" .PGUSER | b64enc }}
-  PGPASSWORD: {{ required "missing PGPASSWORD value" .PGPASSWORD | b64enc }}
+  AIDBOX_LICENSE: {{ .AIDBOX_LICENSE | b64enc }}
+  PGUSER: {{ .PGUSER | b64enc }}
+  PGPASSWORD: {{ .PGPASSWORD | b64enc }}
   {{- end }}
diff --git a/aidboxdb/Chart.yaml b/aidboxdb/Chart.yaml
@@ -5,4 +5,4 @@ home: https://www.health-samurai.io/aidbox
 icon: https://aidbox.github.io/helm-charts/icon.png?1712669999
 name: aidboxdb
 type: application
-version: 0.1.6
+version: 0.1.7
diff --git a/aidboxdb/README.md b/aidboxdb/README.md
@@ -2,7 +2,7 @@
 
 [AidboxDB](https://docs.aidbox.app/storage-1/aidboxdb-image) is a specialized version of the open-source PostgreSQL database, tailored for use as the data storage backend for Aidbox. It serves various purposes, including initializing and operating as a master database for Aidbox, functioning as a streaming replica, optimizing FHIR search queries, and supporting backup and maintenance functionalities.
 
-![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 16.1](https://img.shields.io/badge/AppVersion-16.1-informational?style=flat-square)
+![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 16.1](https://img.shields.io/badge/AppVersion-16.1-informational?style=flat-square)
 
 ## Add the helm repository
 

diff --git a/aidboxdb/templates/secrets.yaml b/aidboxdb/templates/secrets.yaml
@@ -6,5 +6,7 @@ metadata:
     {{- include "aidboxdb.labels" . | nindent 4 }}
 type: Opaque
 data:
-  POSTGRES_PASSWORD: {{ required "missing env.POSTGRES_PASSWORD value" .Values.env.POSTGRES_PASSWORD | b64enc }}
-  POSTGRES_USER: {{ required "missing env.POSTGRES_USER value" .Values.env.POSTGRES_USER | b64enc }}
+  {{- with .Values.env }}
+  POSTGRES_PASSWORD: {{ .POSTGRES_PASSWORD | b64enc }}
+  POSTGRES_USER: {{ .POSTGRES_USER | b64enc }}
+  {{- end }}