Merge branch 'refs/heads/fix/open-zaak-dependencies'

# Conflicts: # charts/open-zaak/README.md
fundaments · Jun 18, 2024 · e69a732 · e69a732
2 parents 143f86b + 3fbd195
commit e69a732
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/charts/open-zaak/README.md b/charts/open-zaak/README.md
@@ -23,22 +23,26 @@ helm install open-zaak fundaments-open-zaak/open-zaak \
     --set "ingress.hosts={open-zaak.gemeente.nl}"
 ```
 
+:warning: The default settings are unsafe for production usage. Configure proper secrets, enable persistency and consider High Availability (HA) for the database and the application.
+
+:warning: When you uninstall the chart, the PVCs will not be deleted. This can cause confusion during testing.
+
 If you want to use your own instance of Redis and Postgres instead, you can disable the subcharts:
 
 ```bash
 
 helm install open-zaak fundaments-open-zaak/open-zaak \
---set "tags.redis=false" \
---set "tags.postgresql=false" \
---set "settings.database.host=postgres.gemeente.nl" \
---set "settings.cache.default=redis.gemeente.nl:6379/0" \
---set "settings.cache.axes=redis.gemeente.nl:6379/0" \
---set "settings.allowedHosts=open-zaak.gemeente.nl" \
---set "ingress.enabled=true" \
---set "ingress.hosts={open-zaak.gemeente.nl}"
+    --set "tags.redis=false" \
+    --set "tags.postgresql=false" \
+    --set "settings.database.host=postgres.gemeente.nl" \
+    --set "settings.cache.default=redis.gemeente.nl:6379/0" \
+    --set "settings.cache.axes=redis.gemeente.nl:6379/0" \
+    --set "settings.allowedHosts=open-zaak.gemeente.nl" \
+    --set "ingress.enabled=true" \
+    --set "ingress.hosts={open-zaak.gemeente.nl}"
 ```
 
-:warning: The default settings are unsafe for production usage. Configure proper secrets, enable persistency and consider High Availability (HA) for the database and the application.
+You will probably need to set more values to configure the connection to your own Redis and Postgres instances.
 
 ## Chart and Open Zaak versions alignment
 

diff --git a/charts/open-zaak/values.yaml b/charts/open-zaak/values.yaml
@@ -186,9 +186,11 @@ postgresql:
     size: 1Gi
     existingClaim: null
 
-  auth:
-    database: open-zaak
-    postgresPassword: SUPER-SECRET
+  global:
+    postgresql:
+      auth:
+        database: open-zaak
+        postgresPassword: SUPER-SECRET
 
 ##################
 # Redis subchart #