From 23becda73a4a59e95f1a5cccd2ce34b96c67d9e0 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 10:31:08 +0200 Subject: [PATCH 1/8] Update versions of open-notificaties dependencies. (cherry picked from commit 2f407f85bc5a760878e04eda2e450afefa0ccda7) --- charts/open-notificaties/Chart.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/open-notificaties/Chart.yaml b/charts/open-notificaties/Chart.yaml index 4e0c2f8..73ac69a 100644 --- a/charts/open-notificaties/Chart.yaml +++ b/charts/open-notificaties/Chart.yaml @@ -3,22 +3,22 @@ name: open-notificaties description: API voor het routeren van notificaties type: application -version: 0.8.0 +version: 0.8.1 appVersion: "1.4.0" dependencies: - name: postgresql - version: ~10.12.0 + version: ~15.5.5 repository: https://charts.bitnami.com/bitnami tags: - postgresql - name: redis - version: ~13.0.0 + version: ~19.5.2 repository: https://charts.bitnami.com/bitnami tags: - redis - name: rabbitmq - version: ~8.23.0 + version: ~14.4.1 repository: https://charts.bitnami.com/bitnami tags: - rabbitmq From 6210fc14bcfe69afe496dfc3ef59f24a24d0b962 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 10:49:50 +0200 Subject: [PATCH 2/8] Updated open-notificaties ReadMe. (cherry picked from commit fbbe005dbc0c2c748703b8d99f5e1faad9d87574) --- charts/open-notificaties/README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index 4b79d6a..d3b5fb1 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -24,6 +24,24 @@ helm install open-notificaties open-zaak/open-notificaties \ --set "ingress.hosts={open-notificaties.gemeente.nl}" ``` +If you want to use your own instance of Redis, Postgres and RabbitMQ instead, you can disable the subcharts: + +```bash + +helm install open-zaak open-zaak/open-zaak \ + --set "tags.redis=false" \ + --set "tags.postgresql=false" \ + --set "tags.rabbitmq=false" \ + --set "settings.database.host=postgres.gemeente.nl" \ + --set "settings.cache.default=redis.gemeente.nl:6379/1" \ + --set "settings.cache.axes=redis.gemeente.nl:6379/1" \ + --set "settings.celery.resultBackend=redis.gemeente.nl:6379/2" \ + --set "settings.messageBroker.host=rabbitmq.gemeente.nl" \ + --set "settings.allowedHosts=open-notificaties.gemeente.nl" \ + --set "ingress.enabled=true" \ + --set "ingress.hosts={open-notificaties.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. ## Chart and Open Notificaties versions alignment From d39189c6e77d5c8bb1ac2424ccf1e3a872ec311f Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 10:59:38 +0200 Subject: [PATCH 3/8] Fix ReadMe (cherry picked from commit 154cb40e693222e988c91b7906f869d70344c016) --- charts/open-notificaties/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index d3b5fb1..8774b48 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -28,7 +28,7 @@ If you want to use your own instance of Redis, Postgres and RabbitMQ instead, yo ```bash -helm install open-zaak open-zaak/open-zaak \ +helm install open-notificaties open-zaak/open-notificaties \ --set "tags.redis=false" \ --set "tags.postgresql=false" \ --set "tags.rabbitmq=false" \ From 8e8675ae7b3d22a70e136c0aab28e81109913668 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 14:19:31 +0200 Subject: [PATCH 4/8] Fixed Postgres values (cherry picked from commit 9426de70d746459394d043762e6fe55d1a65b1c5) --- charts/open-notificaties/values.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml index 583bdfe..7cd1388 100644 --- a/charts/open-notificaties/values.yaml +++ b/charts/open-notificaties/values.yaml @@ -196,8 +196,11 @@ postgresql: size: 1Gi existingClaim: null - postgresqlDatabase: open-notificaties - postgresqlPassword: SUPER-SECRET + global: + postgresql: + auth: + database: open-notificaties + postgresPassword: SUPER-SECRET ################## # Redis subchart # From 2109eb172fef6735cd1922aa4c35e7730f791c52 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 15:00:52 +0200 Subject: [PATCH 5/8] Updated Readme --- charts/open-notificaties/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index 8774b48..5192c9a 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -24,7 +24,11 @@ helm install open-notificaties open-zaak/open-notificaties \ --set "ingress.hosts={open-notificaties.gemeente.nl}" ``` -If you want to use your own instance of Redis, Postgres and RabbitMQ instead, you can disable the subcharts: +: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 instances of Redis, Postgres and RabbitMQ instead, you can disable the subcharts: ```bash @@ -42,7 +46,7 @@ helm install open-notificaties open-zaak/open-notificaties \ --set "ingress.hosts={open-notificaties.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 Notificaties versions alignment From ad08c81f8403030e09df747b7bea0f6a834769e8 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 15:01:20 +0200 Subject: [PATCH 6/8] Updated Readme --- charts/open-notificaties/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index 5192c9a..fd27b50 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -46,7 +46,7 @@ helm install open-notificaties open-zaak/open-notificaties \ --set "ingress.hosts={open-notificaties.gemeente.nl}" ``` -You will probably need to set more values to configure the connection to your own Redis and Postgres instances. +You will probably need to set more values to configure the connection to your own Redis, Postgres and RabbitMQ instances. ## Chart and Open Notificaties versions alignment From 52be244c33f2e999d1264b00c9c01df9d14fe4ab Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 15:06:58 +0200 Subject: [PATCH 7/8] Updated Readme --- charts/open-notificaties/README.md | 132 ++++++++++++++--------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index fd27b50..cc33cbc 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -62,71 +62,71 @@ table below describes the supported versions ## Configuration -| Parameter | Description | Default | -| --------- | ----------- | ------- | -| `tags.postgresql` | Install PostgreSQL subchart | `true` | -| `tags.redis` | Install Redis subchart | `true` | -| `tags.rabbitmq` | Install RabbitMQ subchart | `true` | -| `image.repository` | The repository of the Docker image | `openzaak/open-notificaties` | -| `image.tag` | The tag of the Docker image | `""` (uses `.Chart.AppVersion` by default) | -| `replicaCount` | The number of replicas | `1` | -| `podLabels` | Additional labels to be set on the open-notification API pods | `{}` | -| `ingress.enabled` | Expose the application through an ingress | `false` | -| `ingress.annotations` | Additional annotations on the API ingress | `{}` | -| `ingress.hosts` | Ingress hosts | `"{open-notificaties.gemeente.nl}"` | -| `ingress.tls` | Ingress TLS settings | `"[]"` | -| `existingSecret` | Refer to an existing secret to avoid managing secrets through Helm. See templates/secret.yaml for required contents of your existing secret. This secret is also used for the Worker and Flower components. | `null` | -| `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-notificaties.gemeente.nl"` | -| `settings.secretKey` | The secret key of the application | `"SOME-RANDOM-SECRET"` | -| `settings.database.host` | The hostname of PostgreSQL | `"open-notificaties-postgresql"` | -| `settings.database.port` | The port of PostgreSQL | `5432` | -| `settings.database.username` | The username of PostgreSQL | `"postgres"` | -| `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"` | -| `settings.email.port` | The port of the SMTP server | `25` | -| `settings.email.username` | The username of the SMTP server | `""` | -| `settings.email.password` | The password of the SMTP server | `""` | -| `settings.email.useTLS` | Use TLS for connecting to SMTP server | `false` | -| `settings.sentry.dsn` | The DSN for Sentry Logging | `""` | -| `settings.messageBroker.host` | The URL to the Celery broker | `"open-notificaties-rabbitmq"` | -| `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 | `{}` | -| `postgresql.persistence.enabled` | Enable PostgreSQL persistency | `false` | -| `postgresql.persistence.size` | Configure PostgreSQL size | `"1Gi"` | -| `postgresql.persistence.existingClaim` | Use an existing persistent volume claim | `null` | -| `postgresql.postgresqlDatabase` | The PostgreSQL database name | `"open-notificaties"` | -| `postgresql.postgresqlPassword` | The PostgreSQL administrative password | `"SUPER-SECRET"` | -| `flower.enabled` | Whether or not to deploy the [Flower](https://flower.readthedocs.io/en/latest/) component, which is a monitoring tool for Celery | `false` | -| `flower.replicaCount` | The number of replicas for Celery Flower | `1` | -| `flower.podLabels` | Additional labels to be set for Celery Flower | `{}` | -| `flower.extraEnvVars` | Configure Flower through additional environment variables. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | -| `flower.extraEnvVarsSecret` | Configure Flower through additional environment variables. This property should contain secrets like basic-auth. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | -| `flower.ingress.enabled` | Use a dedicated Ingress for Flower, which can act as a Management Ingress. When `Values.ingress.enabled` is set to true and this parameter to false, then Flower will be exposed on the main Ingress. | `false` | -| `flower.ingress.annotations` | Additional annotations on the Flower Ingress | `{}` | -| `flower.ingress.hosts` | Flower Ingress hosts | `"{open-notificaties-flower.gemeente.nl}"` | -| `flower.ingress.tls` | Flower Ingress TLS settings | `"[]"` | -| `redis.usePassword` | Use a Redis password | `false` | -| `redis.cluster.enabled` | Enable Redis cluster | `false` | -| `redis.persistence.existingClaim` | Use existing persistent volume claim for Redis | `""` | -| `redis.master.persistence.enabled` | Enable persistency for Redis master | `false` | -| `redis.master.persistence.size` | The size of the Redis master persistent volume | `"1Gi"` | -| `rabbitmq.auth.username` | RabbitMQ username | `"guest"` | -| `rabbitmq.auth.password` | RabbitMQ password | `"guest"` | -| `rabbitmq.auth.erlangCookie` | RabbitMQ Erlang Cookie | `"SUPER-SECRET"` | -| `rabbitmq.persistence.enabled` | Enable RabbitMQ persistency | `false` | -| `rabbitmq.persistence.size` | Configure RabbitMQ size | `"1Gi"` | -| `rabbitmq.persistence.existingClaim` | Use an existing persistent volume claim | `null` | +| Parameter | Description | Default | +|--------------------------------------------------------| ----------- | ------- | +| `tags.postgresql` | Install PostgreSQL subchart | `true` | +| `tags.redis` | Install Redis subchart | `true` | +| `tags.rabbitmq` | Install RabbitMQ subchart | `true` | +| `image.repository` | The repository of the Docker image | `openzaak/open-notificaties` | +| `image.tag` | The tag of the Docker image | `""` (uses `.Chart.AppVersion` by default) | +| `replicaCount` | The number of replicas | `1` | +| `podLabels` | Additional labels to be set on the open-notification API pods | `{}` | +| `ingress.enabled` | Expose the application through an ingress | `false` | +| `ingress.annotations` | Additional annotations on the API ingress | `{}` | +| `ingress.hosts` | Ingress hosts | `"{open-notificaties.gemeente.nl}"` | +| `ingress.tls` | Ingress TLS settings | `"[]"` | +| `existingSecret` | Refer to an existing secret to avoid managing secrets through Helm. See templates/secret.yaml for required contents of your existing secret. This secret is also used for the Worker and Flower components. | `null` | +| `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-notificaties.gemeente.nl"` | +| `settings.secretKey` | The secret key of the application | `"SOME-RANDOM-SECRET"` | +| `settings.database.host` | The hostname of PostgreSQL | `"open-notificaties-postgresql"` | +| `settings.database.port` | The port of PostgreSQL | `5432` | +| `settings.database.username` | The username of PostgreSQL | `"postgres"` | +| `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"` | +| `settings.email.port` | The port of the SMTP server | `25` | +| `settings.email.username` | The username of the SMTP server | `""` | +| `settings.email.password` | The password of the SMTP server | `""` | +| `settings.email.useTLS` | Use TLS for connecting to SMTP server | `false` | +| `settings.sentry.dsn` | The DSN for Sentry Logging | `""` | +| `settings.messageBroker.host` | The URL to the Celery broker | `"open-notificaties-rabbitmq"` | +| `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 | `{}` | +| `postgresql.persistence.enabled` | Enable PostgreSQL persistency | `false` | +| `postgresql.persistence.size` | Configure PostgreSQL size | `"1Gi"` | +| `postgresql.persistence.existingClaim` | Use an existing persistent volume claim | `null` | +| `postgresql.global.postgresql.auth.database` | The PostgreSQL database name | `"open-notificaties"` | +| `postgresql.global.postgresql.auth.postgresqlPassword` | The PostgreSQL administrative password | `"SUPER-SECRET"` | +| `flower.enabled` | Whether or not to deploy the [Flower](https://flower.readthedocs.io/en/latest/) component, which is a monitoring tool for Celery | `false` | +| `flower.replicaCount` | The number of replicas for Celery Flower | `1` | +| `flower.podLabels` | Additional labels to be set for Celery Flower | `{}` | +| `flower.extraEnvVars` | Configure Flower through additional environment variables. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | +| `flower.extraEnvVarsSecret` | Configure Flower through additional environment variables. This property should contain secrets like basic-auth. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | +| `flower.ingress.enabled` | Use a dedicated Ingress for Flower, which can act as a Management Ingress. When `Values.ingress.enabled` is set to true and this parameter to false, then Flower will be exposed on the main Ingress. | `false` | +| `flower.ingress.annotations` | Additional annotations on the Flower Ingress | `{}` | +| `flower.ingress.hosts` | Flower Ingress hosts | `"{open-notificaties-flower.gemeente.nl}"` | +| `flower.ingress.tls` | Flower Ingress TLS settings | `"[]"` | +| `redis.usePassword` | Use a Redis password | `false` | +| `redis.cluster.enabled` | Enable Redis cluster | `false` | +| `redis.persistence.existingClaim` | Use existing persistent volume claim for Redis | `""` | +| `redis.master.persistence.enabled` | Enable persistency for Redis master | `false` | +| `redis.master.persistence.size` | The size of the Redis master persistent volume | `"1Gi"` | +| `rabbitmq.auth.username` | RabbitMQ username | `"guest"` | +| `rabbitmq.auth.password` | RabbitMQ password | `"guest"` | +| `rabbitmq.auth.erlangCookie` | RabbitMQ Erlang Cookie | `"SUPER-SECRET"` | +| `rabbitmq.persistence.enabled` | Enable RabbitMQ persistency | `false` | +| `rabbitmq.persistence.size` | Configure RabbitMQ size | `"1Gi"` | +| `rabbitmq.persistence.existingClaim` | Use an existing persistent volume claim | `null` | Check [values.yaml](./values.yaml) for all the possible configuration options. From a496d2edc06436e479b451c0c9e1b6bd9239d4b9 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Tue, 18 Jun 2024 20:03:43 +0200 Subject: [PATCH 8/8] Fixed values for subcharts --- charts/open-notificaties/README.md | 129 +++++++++++++-------------- charts/open-notificaties/values.yaml | 17 ++-- 2 files changed, 71 insertions(+), 75 deletions(-) diff --git a/charts/open-notificaties/README.md b/charts/open-notificaties/README.md index cc33cbc..fac07ba 100644 --- a/charts/open-notificaties/README.md +++ b/charts/open-notificaties/README.md @@ -62,71 +62,70 @@ table below describes the supported versions ## Configuration -| Parameter | Description | Default | -|--------------------------------------------------------| ----------- | ------- | -| `tags.postgresql` | Install PostgreSQL subchart | `true` | -| `tags.redis` | Install Redis subchart | `true` | -| `tags.rabbitmq` | Install RabbitMQ subchart | `true` | -| `image.repository` | The repository of the Docker image | `openzaak/open-notificaties` | -| `image.tag` | The tag of the Docker image | `""` (uses `.Chart.AppVersion` by default) | -| `replicaCount` | The number of replicas | `1` | -| `podLabels` | Additional labels to be set on the open-notification API pods | `{}` | -| `ingress.enabled` | Expose the application through an ingress | `false` | -| `ingress.annotations` | Additional annotations on the API ingress | `{}` | -| `ingress.hosts` | Ingress hosts | `"{open-notificaties.gemeente.nl}"` | -| `ingress.tls` | Ingress TLS settings | `"[]"` | -| `existingSecret` | Refer to an existing secret to avoid managing secrets through Helm. See templates/secret.yaml for required contents of your existing secret. This secret is also used for the Worker and Flower components. | `null` | -| `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-notificaties.gemeente.nl"` | -| `settings.secretKey` | The secret key of the application | `"SOME-RANDOM-SECRET"` | -| `settings.database.host` | The hostname of PostgreSQL | `"open-notificaties-postgresql"` | -| `settings.database.port` | The port of PostgreSQL | `5432` | -| `settings.database.username` | The username of PostgreSQL | `"postgres"` | -| `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"` | -| `settings.email.port` | The port of the SMTP server | `25` | -| `settings.email.username` | The username of the SMTP server | `""` | -| `settings.email.password` | The password of the SMTP server | `""` | -| `settings.email.useTLS` | Use TLS for connecting to SMTP server | `false` | -| `settings.sentry.dsn` | The DSN for Sentry Logging | `""` | -| `settings.messageBroker.host` | The URL to the Celery broker | `"open-notificaties-rabbitmq"` | -| `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 | `{}` | -| `postgresql.persistence.enabled` | Enable PostgreSQL persistency | `false` | -| `postgresql.persistence.size` | Configure PostgreSQL size | `"1Gi"` | -| `postgresql.persistence.existingClaim` | Use an existing persistent volume claim | `null` | -| `postgresql.global.postgresql.auth.database` | The PostgreSQL database name | `"open-notificaties"` | +| Parameter | Description | Default | +|-------------------------------------------------------| ----------- | ------- | +| `tags.postgresql` | Install PostgreSQL subchart | `true` | +| `tags.redis` | Install Redis subchart | `true` | +| `tags.rabbitmq` | Install RabbitMQ subchart | `true` | +| `image.repository` | The repository of the Docker image | `openzaak/open-notificaties` | +| `image.tag` | The tag of the Docker image | `""` (uses `.Chart.AppVersion` by default) | +| `replicaCount` | The number of replicas | `1` | +| `podLabels` | Additional labels to be set on the open-notification API pods | `{}` | +| `ingress.enabled` | Expose the application through an ingress | `false` | +| `ingress.annotations` | Additional annotations on the API ingress | `{}` | +| `ingress.hosts` | Ingress hosts | `"{open-notificaties.gemeente.nl}"` | +| `ingress.tls` | Ingress TLS settings | `"[]"` | +| `existingSecret` | Refer to an existing secret to avoid managing secrets through Helm. See templates/secret.yaml for required contents of your existing secret. This secret is also used for the Worker and Flower components. | `null` | +| `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-notificaties.gemeente.nl"` | +| `settings.secretKey` | The secret key of the application | `"SOME-RANDOM-SECRET"` | +| `settings.database.host` | The hostname of PostgreSQL | `"open-notificaties-postgresql"` | +| `settings.database.port` | The port of PostgreSQL | `5432` | +| `settings.database.username` | The username of PostgreSQL | `"postgres"` | +| `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"` | +| `settings.email.port` | The port of the SMTP server | `25` | +| `settings.email.username` | The username of the SMTP server | `""` | +| `settings.email.password` | The password of the SMTP server | `""` | +| `settings.email.useTLS` | Use TLS for connecting to SMTP server | `false` | +| `settings.sentry.dsn` | The DSN for Sentry Logging | `""` | +| `settings.messageBroker.host` | The URL to the Celery broker | `"open-notificaties-rabbitmq"` | +| `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 | `{}` | +| `postgresql.primary.ersistence.enabled` | Enable PostgreSQL persistency | `false` | +| `postgresql.primary.persistence.size` | Configure PostgreSQL size | `"1Gi"` | +| `postgresql.primary.persistence.existingClaim` | Use an existing persistent volume claim | `null` | +| `postgresql.global.postgresql.auth.database` | The PostgreSQL database name | `"open-notificaties"` | | `postgresql.global.postgresql.auth.postgresqlPassword` | The PostgreSQL administrative password | `"SUPER-SECRET"` | -| `flower.enabled` | Whether or not to deploy the [Flower](https://flower.readthedocs.io/en/latest/) component, which is a monitoring tool for Celery | `false` | -| `flower.replicaCount` | The number of replicas for Celery Flower | `1` | -| `flower.podLabels` | Additional labels to be set for Celery Flower | `{}` | -| `flower.extraEnvVars` | Configure Flower through additional environment variables. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | -| `flower.extraEnvVarsSecret` | Configure Flower through additional environment variables. This property should contain secrets like basic-auth. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | -| `flower.ingress.enabled` | Use a dedicated Ingress for Flower, which can act as a Management Ingress. When `Values.ingress.enabled` is set to true and this parameter to false, then Flower will be exposed on the main Ingress. | `false` | -| `flower.ingress.annotations` | Additional annotations on the Flower Ingress | `{}` | -| `flower.ingress.hosts` | Flower Ingress hosts | `"{open-notificaties-flower.gemeente.nl}"` | -| `flower.ingress.tls` | Flower Ingress TLS settings | `"[]"` | -| `redis.usePassword` | Use a Redis password | `false` | -| `redis.cluster.enabled` | Enable Redis cluster | `false` | -| `redis.persistence.existingClaim` | Use existing persistent volume claim for Redis | `""` | -| `redis.master.persistence.enabled` | Enable persistency for Redis master | `false` | -| `redis.master.persistence.size` | The size of the Redis master persistent volume | `"1Gi"` | -| `rabbitmq.auth.username` | RabbitMQ username | `"guest"` | -| `rabbitmq.auth.password` | RabbitMQ password | `"guest"` | -| `rabbitmq.auth.erlangCookie` | RabbitMQ Erlang Cookie | `"SUPER-SECRET"` | -| `rabbitmq.persistence.enabled` | Enable RabbitMQ persistency | `false` | -| `rabbitmq.persistence.size` | Configure RabbitMQ size | `"1Gi"` | -| `rabbitmq.persistence.existingClaim` | Use an existing persistent volume claim | `null` | +| `flower.enabled` | Whether or not to deploy the [Flower](https://flower.readthedocs.io/en/latest/) component, which is a monitoring tool for Celery | `false` | +| `flower.replicaCount` | The number of replicas for Celery Flower | `1` | +| `flower.podLabels` | Additional labels to be set for Celery Flower | `{}` | +| `flower.extraEnvVars` | Configure Flower through additional environment variables. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | +| `flower.extraEnvVarsSecret` | Configure Flower through additional environment variables. This property should contain secrets like basic-auth. For a full list of possibilities, see [Flower config docs](https://flower.readthedocs.io/en/latest/config.html) | `{}` | +| `flower.ingress.enabled` | Use a dedicated Ingress for Flower, which can act as a Management Ingress. When `Values.ingress.enabled` is set to true and this parameter to false, then Flower will be exposed on the main Ingress. | `false` | +| `flower.ingress.annotations` | Additional annotations on the Flower Ingress | `{}` | +| `flower.ingress.hosts` | Flower Ingress hosts | `"{open-notificaties-flower.gemeente.nl}"` | +| `flower.ingress.tls` | Flower Ingress TLS settings | `"[]"` | +| `redis.auth.enabled` | Use a Redis password | `false` | +| `redis.master.persistence.enabled` | Enable persistency for Redis master | `false` | +| `redis.master.persistence.size` | The size of the Redis master persistent volume | `"1Gi"` | +| `redis.master.persistence.existingClaim` | Use existing persistent volume claim for Redis | `""` | +| `rabbitmq.auth.username` | RabbitMQ username | `"guest"` | +| `rabbitmq.auth.password` | RabbitMQ password | `"guest"` | +| `rabbitmq.auth.erlangCookie` | RabbitMQ Erlang Cookie | `"SUPER-SECRET"` | +| `rabbitmq.persistence.enabled` | Enable RabbitMQ persistency | `false` | +| `rabbitmq.persistence.size` | Configure RabbitMQ size | `"1Gi"` | +| `rabbitmq.persistence.existingClaim` | Use an existing persistent volume claim | `null` | Check [values.yaml](./values.yaml) for all the possible configuration options. diff --git a/charts/open-notificaties/values.yaml b/charts/open-notificaties/values.yaml index 7cd1388..4244acd 100644 --- a/charts/open-notificaties/values.yaml +++ b/charts/open-notificaties/values.yaml @@ -191,10 +191,11 @@ settings: ####################### postgresql: - persistence: - enabled: false - size: 1Gi - existingClaim: null + primary: + persistence: + enabled: false + size: 1Gi + existingClaim: null global: postgresql: @@ -207,18 +208,14 @@ postgresql: ################## redis: - usePassword: false - - cluster: + auth: enabled: false - persistence: - existingClaim: null - master: persistence: enabled: false size: 1Gi + existingClaim: null ##################### # RabbitMQ subchart #