Merge pull request open-zaak#25 from open-zaak/feature/open-notificat…

…ies-1.4.0 Update for Open Notificaties 1.4.0
fundaments · Jun 1, 2023 · 757308c · 757308c
2 parents 844966d + bfdac96
commit 757308c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/charts/open-notificaties/Chart.yaml b/charts/open-notificaties/Chart.yaml
@@ -3,8 +3,8 @@ name: open-notificaties
 description: API voor het routeren van notificaties
 
 type: application
-version: 0.7.0
-appVersion: "1.3.0"
+version: 0.8.0
+appVersion: "1.4.0"
 
 dependencies:
   - name: postgresql

diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md
@@ -36,6 +36,7 @@ table below describes the supported versions
 | < 0.5.0       | < 1.2.0 |
 | 0.5.0         | 1.2.x   |
 | 0.7.0         | 1.3.0 + |
+| 0.8.0         | 1.4.0 + |
 
 ## Configuration
 
@@ -74,6 +75,9 @@ table below describes the supported versions
 | `settings.celery.resultBackend` | The URL to the Celery result backend | `"redis://open-notificaties-redis-master:6379/1"` |
 | `settings.isHttps` | Used to construct absolute URLs and controls a variety of security settings | `true` |
 | `settings.debug` | Only set this to True on a local development environment. Various other security settings are derived from this setting | `false` |
+| `settings.autoRetry.maxRetries` | Maximum number of notification delivery retries. If `null`, the upstream defaults are used. | `null` |
+| `settings.autoRetry.backoff` | Exponential backoff, boolean or number. If a number, applies as a scale factor. If `null`, the upstream defaults are used. | `null` |
+| `settings.autoRetry.backoffMax` | Upper limit (in seconds) of the exponential backoff. If `null`, the upstream defaults are used. | `null` |
 | `settings.flower.urlPrefix` | If enabled, deploy Flower on a non-root URL | `""` |
 | `settings.flower.basicAuth` | Secure Flower with [Basic Authentication](https://flower.readthedocs.io/en/latest/config.html#basic-auth). This is a comma-separated list of `username:password`. You should configure this when `flower.ingress.enabled` is set to true. | `""` |
 | `worker.podLabels` | Additional labels to be set on the open-notification worker pods | `{}` |

diff --git a/charts/open-notificaties/templates/configmap.yaml b/charts/open-notificaties/templates/configmap.yaml
@@ -24,6 +24,15 @@ data:
   {{- end }}
   IS_HTTPS: {{ if .Values.settings.isHttps }}"True"{{ else }}"False"{{ end }}
   RABBITMQ_HOST: {{ .Values.settings.messageBroker.host }}
+  {{- if not eq .Values.settings.autoRetry.maxRetries nil }}
+  NOTIFICATION_DELIVERY_MAX_RETRIES: {{ .Values.settings.autoRetry.maxRetries | toString | quote }}
+  {{- end }}
+  {{- if .Values.settings.autoRetry.backoff }}
+  NOTIFICATION_DELIVERY_RETRY_BACKOFF: {{ .Values.settings.autoRetry.backoff | toString | quote}}
+  {{- end }}
+  {{- if .Values.settings.autoRetry.backoffMax }}
+  NOTIFICATION_DELIVERY_RETRY_BACKOFF_MAX: {{ .Values.settings.autoRetry.backoffMax | toString | quote }}
+  {{- end }}
   {{- if .Values.settings.flower.urlPrefix }}
   FLOWER_URL_PREFIX: {{ .Values.settings.flower.urlPrefix }}
   {{- end }}

diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml
@@ -177,6 +177,11 @@ settings:
 
   debug: false
 
+  autoRetry:
+    maxRetries: null
+    backoff: null
+    backoffMax: null
+
   flower:
     urlPrefix: ""
     basicAuth: ""