feat(shiny): allow use of an external postresql database

InseeFrLab · Aug 15, 2023 · 3d83681 · 3d83681
1 parent 3f14c22
commit 3d83681
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/charts/shiny/Chart.yaml b/charts/shiny/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.27.0
+version: 1.0.0
 
 dependencies:
   - name: postgresql
     version: 12.1.5
     repository: https://charts.bitnami.com/bitnami
-    condition: postgresql.enabled
+    condition: postgresql.enabled.internal
   - name: library-chart
     version: 1.3.15
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/shiny/templates/deployment.yaml b/charts/shiny/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
           command: {{ .Values.image.command }}
           {{- end }}
           env:
-          {{- if .Values.postgresql.enabled }}
+          {{- if or (.Values.postgresql.enabled.internal) (.Values.postgresql.enabled.external) }}
           - name: POSTGRESQL_DB_NAME
             value: {{ .Values.postgresql.auth.database }}
           - name: POSTGRESQL_DB_HOST
@@ -118,7 +118,7 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             {{- toYaml .Values.volumeMounts | default "" | nindent 12 }}
-      {{- if .Values.postgresql.enabled }}
+      {{- if .Values.postgresql.enabled.internal }}
       initContainers:
         - name: wait-for-postgresql
           image: "alpine"

diff --git a/charts/shiny/values.yaml b/charts/shiny/values.yaml
@@ -108,7 +108,9 @@ s3:
   sessionToken: ""
 
 postgresql:
-  enabled: false
+  enabled:
+    internal: false
+    external: false
   auth:
     username: ""
     database: ""