Merge pull request #126 from maykinmedia/feature/openinwoner-1.5.1

🔖 openinwoner helm release version 1.5.1
maykinmedia · Sep 2, 2024 · 96173d6 · 96173d6
2 parents 7b1e69b + f41c4ab
commit 96173d6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /.idea/
+*.tgz
+.vscode
diff --git a/charts/openinwoner/Chart.yaml b/charts/openinwoner/Chart.yaml
@@ -3,8 +3,9 @@ name: openinwoner
 description: Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijker te maken voor inwoners.
 
 type: application
-version: 1.5.0
-appVersion: "1.19.0"
+version: 1.5.1
+appVersion: "1.20.0"
+icon: https://docs.openinwoner.nl/en/latest/_static/logo.png
 
 dependencies:
   - name: redis

diff --git a/charts/openinwoner/README.md b/charts/openinwoner/README.md
@@ -1,6 +1,6 @@
 # openinwoner
 
-![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.19.0](https://img.shields.io/badge/AppVersion-1.19.0-informational?style=flat-square)
+![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.20.0](https://img.shields.io/badge/AppVersion-1.20.0-informational?style=flat-square)
 
 Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijker te maken voor inwoners.
 
@@ -39,13 +39,15 @@ helm install my-release my-repo/openinwoner
 | celeryMonitor.replicaCount | int | `1` |  |
 | celeryMonitor.resources | object | `{}` |  |
 | elasticsearch.coordinating.replicaCount | int | `1` |  |
-| elasticsearch.data.persistence.enabled | bool | `false` |  |
+| elasticsearch.data.persistence.enabled | bool | `true` |  |
 | elasticsearch.data.persistence.size | string | `"8Gi"` |  |
+| elasticsearch.data.persistence.storageClass | string | `""` |  |
 | elasticsearch.data.replicaCount | int | `1` |  |
 | elasticsearch.ingest.enabled | bool | `false` |  |
 | elasticsearch.master.masterOnly | bool | `true` |  |
-| elasticsearch.master.persistence.enabled | bool | `false` |  |
-| elasticsearch.master.persistence.size | string | `""` |  |
+| elasticsearch.master.persistence.enabled | bool | `true` |  |
+| elasticsearch.master.persistence.size | string | `"8Gi"` |  |
+| elasticsearch.master.persistence.storageClass | string | `""` |  |
 | elasticsearch.master.replicaCount | int | `1` |  |
 | elasticsearch.master.resources.limits | object | `{}` |  |
 | elasticsearch.master.resources.requests.cpu | string | `"25m"` |  |
@@ -57,6 +59,7 @@ helm install my-release my-repo/openinwoner
 | extraVolumeMounts | list | `[]` | Optionally specify extra list of additional volumeMounts |
 | extraVolumes | list | `[]` | Optionally specify extra list of additional volumes |
 | fullnameOverride | string | `""` |  |
+| global.settings.databaseHost | string | `""` | Global databasehost, overrides setting.database.host |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"maykinmedia/open-inwoner"` |  |
 | image.tag | string | `""` | uses .Chart.AppVersion by default |
@@ -181,9 +184,9 @@ helm install my-release my-repo/openinwoner
 | worker.concurrency | int | `4` |  |
 | worker.livenessProbe.exec.command[0] | string | `"python"` |  |
 | worker.livenessProbe.exec.command[1] | string | `"/app/bin/check_celery_worker_liveness.py"` |  |
-| worker.livenessProbe.failureThreshold | int | `3` |  |
+| worker.livenessProbe.failureThreshold | int | `10` |  |
 | worker.livenessProbe.initialDelaySeconds | int | `60` |  |
-| worker.livenessProbe.periodSeconds | int | `10` |  |
+| worker.livenessProbe.periodSeconds | int | `50` |  |
 | worker.livenessProbe.successThreshold | int | `1` |  |
 | worker.livenessProbe.timeoutSeconds | int | `5` |  |
 | worker.maxWorkerLivenessDelta | string | `""` |  |

diff --git a/charts/openinwoner/templates/configmap.yaml b/charts/openinwoner/templates/configmap.yaml
@@ -36,7 +36,7 @@ data:
   BRP_VERSION: {{ .Values.settings.brpVersion | toString | quote }}
   {{- end }}
   DB_NAME: {{ .Values.settings.database.name | toString | quote }}
-  DB_HOST: {{ .Values.settings.database.host | toString | quote }}
+  DB_HOST: {{ .Values.global.settings.databaseHost | default .Values.settings.database.host | toString | quote }}
   DB_USER: {{ .Values.settings.database.username | toString | quote }}
   DB_PORT: {{ .Values.settings.database.port | toString | quote }}
   PGSSLMODE: {{ .Values.settings.database.sslmode | toString | quote }}

diff --git a/charts/openinwoner/values.yaml b/charts/openinwoner/values.yaml
@@ -1,3 +1,8 @@
+global:
+  settings:
+    # -- Global databasehost, overrides setting.database.host
+    databaseHost: ""
+
 tags:
   redis: true
   elasticsearch: true
@@ -259,9 +264,9 @@ worker:
         - /app/bin/check_celery_worker_liveness.py
     initialDelaySeconds: 60
     # Periodeseconds should not exceed maxWorkerLivenessDelta
-    periodSeconds: 10
+    periodSeconds: 50
     timeoutSeconds: 5
-    failureThreshold: 3
+    failureThreshold: 10
     successThreshold: 1
   autoscaling:
     enabled: false
@@ -342,8 +347,9 @@ elasticsearch:
     masterOnly: true
     replicaCount: 1
     persistence:
-      enabled: false
-      size: ""
+      enabled: true
+      storageClass: ""
+      size: "8Gi"
     resources:
       limits: {}
       requests:
@@ -352,7 +358,8 @@ elasticsearch:
   data:
     replicaCount: 1
     persistence:
-      enabled: false
+      enabled: true
+      storageClass: ""
       size: 8Gi
   coordinating:
     replicaCount: 1
-Original file line number
+Diff line change
@@ -1 +1,3 @@
     /.idea/
+    *.tgz
+    .vscode