From e3107073d6e46af3f96e06d07d419c403c6be626 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Fri, 25 Mar 2022 16:45:53 +0100 Subject: [PATCH 1/3] :rocket: Update to version 1.3.0 of Open Notificaties --- charts/open-notificaties/Chart.yaml | 2 +- charts/open-notificaties/README.md | 1 + charts/open-notificaties/templates/configmap.yaml | 1 + charts/open-notificaties/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/open-notificaties/Chart.yaml b/charts/open-notificaties/Chart.yaml index 93be29a..c694a40 100644 --- a/charts/open-notificaties/Chart.yaml +++ b/charts/open-notificaties/Chart.yaml @@ -4,7 +4,7 @@ description: API voor het routeren van notificaties type: application version: 0.6.0 -appVersion: "1.2.3" +appVersion: "1.3.0" dependencies: - name: postgresql diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index e3b93ad..afce7c8 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -60,6 +60,7 @@ table below describes the supported versions | `settings.database.password` | The password of PostgreSQL | `"SUPER-SECRET"` | | `settings.database.name` | The database name of PostgreSQL | `"open-notificaties"` | | `settings.database.sslmode` | The SSL-mode used by the postgres client. See [docs](https://www.postgresql.org/docs/current/libpq-ssl.html) for more info | `"prefer"` | +| `settings.numProxies` | The number of reverse proxies between client and backend container. Set this to 1 if exposing the application through an ingress | `0` | | `settings.cache.default` | The Redis cache for the default cache | `"open-notificaties-redis-master:6379/0"` | | `settings.cache.axes` | The Redis cache for the axes cache | `"open-notificaties-redis-master:6379/0"` | | `settings.email.host` | The hostname of the SMTP server | `"localhost"` | diff --git a/charts/open-notificaties/templates/configmap.yaml b/charts/open-notificaties/templates/configmap.yaml index b8f5161..3e76056 100644 --- a/charts/open-notificaties/templates/configmap.yaml +++ b/charts/open-notificaties/templates/configmap.yaml @@ -14,6 +14,7 @@ data: DB_USER: {{ .Values.settings.database.username | toString | quote }} PGSSLMODE: {{ .Values.settings.database.sslmode | toString | quote }} DEBUG: {{ if .Values.settings.debug }}"True"{{ else }}"False"{{ end }} + NUM_PROXIES: {{ .Values.settings.numProxies | toString | quote }} EMAIL_HOST: {{ .Values.settings.email.host | toString | quote }} {{- if .Values.settings.email.username }} EMAIL_USER: {{ .Values.settings.email.username | toString | quote }} diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml index 660f8cb..847f242 100644 --- a/charts/open-notificaties/values.yaml +++ b/charts/open-notificaties/values.yaml @@ -149,6 +149,8 @@ settings: name: open-notificaties sslmode: prefer + numProxies: 0 # use 1 if enabling ingress + email: host: localhost port: 25 From 8c278c5d02cff1f32ee4a8ba752a4b9bbb786238 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Fri, 25 Mar 2022 16:48:32 +0100 Subject: [PATCH 2/3] :rocket: Prepare charts for version 1.6.0 of Open Zaak --- charts/open-zaak/Chart.yaml | 2 +- charts/open-zaak/README.md | 1 + charts/open-zaak/templates/configmap.yaml | 1 + charts/open-zaak/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/open-zaak/Chart.yaml b/charts/open-zaak/Chart.yaml index 1538b39..85b9ddf 100644 --- a/charts/open-zaak/Chart.yaml +++ b/charts/open-zaak/Chart.yaml @@ -4,7 +4,7 @@ description: Productiewaardige API's voor Zaakgericht Werken type: application version: 0.7.0 -appVersion: "1.5.0" +appVersion: "1.6.0" dependencies: - name: postgresql diff --git a/charts/open-zaak/README.md b/charts/open-zaak/README.md index cd82479..96b256b 100644 --- a/charts/open-zaak/README.md +++ b/charts/open-zaak/README.md @@ -64,6 +64,7 @@ table below describes the supported versions | `settings.database.password` | The password of PostgreSQL | `"SUPER-SECRET"` | | `settings.database.name` | The database name of PostgreSQL | `"open-zaak"` | | `settings.database.sslmode` | The SSL-mode used by the postgres client. See [docs](https://www.postgresql.org/docs/current/libpq-ssl.html) for more info | `"prefer"` | +| `settings.numProxies` | The number of reverse proxies between client and backend container. Set this to 2 if exposing the application through an ingress. This chart deploys one nginx reverse proxy already. | `1` | | `settings.cache.default` | The Redis cache for the default cache | `"open-zaak-redis-master:6379/0"` | | `settings.cache.axes` | The Redis cache for the axes cache | `"open-zaak-redis-master:6379/0"` | | `settings.email.host` | The hostname of the SMTP server | `"localhost"` | diff --git a/charts/open-zaak/templates/configmap.yaml b/charts/open-zaak/templates/configmap.yaml index 9ccc4ae..083c5d7 100644 --- a/charts/open-zaak/templates/configmap.yaml +++ b/charts/open-zaak/templates/configmap.yaml @@ -23,6 +23,7 @@ data: DB_USER: {{ .Values.settings.database.username | toString | quote }} PGSSLMODE: {{ .Values.settings.database.sslmode | toString | quote }} DEBUG: {{ if .Values.settings.debug }}"True"{{ else }}"False"{{ end }} + NUM_PROXIES: {{ .Values.settings.numProxies | toString | quote }} EMAIL_HOST: {{ .Values.settings.email.host | toString | quote }} {{- if .Values.settings.email.username }} EMAIL_USER: {{ .Values.settings.email.username | toString | quote }} diff --git a/charts/open-zaak/values.yaml b/charts/open-zaak/values.yaml index b543f59..d4fc912 100644 --- a/charts/open-zaak/values.yaml +++ b/charts/open-zaak/values.yaml @@ -113,6 +113,8 @@ settings: name: open-zaak sslmode: prefer + numProxies: 1 # use 2 if enabling ingress + email: host: localhost port: 25 From e3ef38569899e76bc2c5e6d527a2d7f6e4a400f6 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Thu, 31 Mar 2022 17:51:26 +0200 Subject: [PATCH 3/3] :bookmark: Bump chart versions and version compatibility tables --- charts/open-notificaties/Chart.yaml | 2 +- charts/open-notificaties/README.md | 3 ++- charts/open-zaak/Chart.yaml | 2 +- charts/open-zaak/README.md | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/open-notificaties/Chart.yaml b/charts/open-notificaties/Chart.yaml index c694a40..11518de 100644 --- a/charts/open-notificaties/Chart.yaml +++ b/charts/open-notificaties/Chart.yaml @@ -3,7 +3,7 @@ name: open-notificaties description: API voor het routeren van notificaties type: application -version: 0.6.0 +version: 0.7.0 appVersion: "1.3.0" dependencies: diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index afce7c8..a2f538a 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -34,7 +34,8 @@ table below describes the supported versions | Chart version | Open Notificaties version | | ------------- | ------------------------- | | < 0.5.0 | < 1.2.0 | -| 0.5.0 | 1.2.0 + | +| 0.5.0 | 1.2.x | +| 0.7.0 | 1.3.0 + | ## Configuration diff --git a/charts/open-zaak/Chart.yaml b/charts/open-zaak/Chart.yaml index 85b9ddf..adff940 100644 --- a/charts/open-zaak/Chart.yaml +++ b/charts/open-zaak/Chart.yaml @@ -3,7 +3,7 @@ name: open-zaak description: Productiewaardige API's voor Zaakgericht Werken type: application -version: 0.7.0 +version: 0.8.0 appVersion: "1.6.0" dependencies: diff --git a/charts/open-zaak/README.md b/charts/open-zaak/README.md index 96b256b..0555fc0 100644 --- a/charts/open-zaak/README.md +++ b/charts/open-zaak/README.md @@ -33,7 +33,8 @@ table below describes the supported versions | Chart version | Open Zaak version | | ------------- | ----------------- | | < 0.5.0 | < 1.5.0 | -| 0.5.0 | 1.5.0 + | +| 0.5.0 | 1.5.x | +| 0.7.0 | 1.6.0 + | ## Configuration