From ac3411161c1d5907195eeb89906326b00af1d4dc Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Tue, 19 Nov 2024 03:49:19 +0200 Subject: [PATCH] Fixed cron database name (#61) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Philippe Noël chore: Hardcode version in ParadeDB tests (#66) --- charts/paradedb/Chart.yaml | 4 ++-- charts/paradedb/README.md | 2 +- charts/paradedb/README.md.gotmpl | 14 ++++++++++++-- charts/paradedb/examples/image-catalog-ref.yaml | 4 ++-- charts/paradedb/examples/image-catalog.yaml | 2 +- charts/paradedb/examples/paradedb.yaml | 2 +- charts/paradedb/templates/cluster.yaml | 8 ++++++-- .../01-paradedb-NCC-1701-D_cluster.yaml | 4 +++- .../01-paradedb_cluster.yaml | 4 +++- charts/paradedb/values.yaml | 10 ++++------ 10 files changed, 35 insertions(+), 19 deletions(-) diff --git a/charts/paradedb/Chart.yaml b/charts/paradedb/Chart.yaml index c25eb8a69..1a9092b39 100644 --- a/charts/paradedb/Chart.yaml +++ b/charts/paradedb/Chart.yaml @@ -20,8 +20,8 @@ icon: https://raw.githubusercontent.com/paradedb/paradedb/main/docs/logo/light.s type: application # The Chart version, set in the publish CI workflow from GitHub Actions Variables -# We default to v0.12.1 for testing and local development -version: 0.12.1 +# We default to v0.12.2 for testing and local development +version: 0.12.2 sources: - https://github.com/paradedb/charts diff --git a/charts/paradedb/README.md b/charts/paradedb/README.md index 7adb04f88..483dabaef 100644 --- a/charts/paradedb/README.md +++ b/charts/paradedb/README.md @@ -309,7 +309,7 @@ refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat | recovery.secret.create | bool | `true` | Whether to create a secret for the backup credentials | | recovery.secret.name | string | `""` | Name of the backup credentials secret | | type | string | `"paradedb"` | Type of the CNPG database. Available types: * `paradedb` * `paradedb-enterprise` | -| version.paradedb | string | `"0.12.1"` | We default to v0.12.1 for testing and local development | +| version.paradedb | string | `"0.12.2"` | We default to v0.12.2 for testing and local development | | version.postgresql | string | `"17"` | PostgreSQL major version to use | | poolers[].name | string | `` | Name of the pooler resource | | poolers[].instances | number | `1` | The number of replicas we want | diff --git a/charts/paradedb/README.md.gotmpl b/charts/paradedb/README.md.gotmpl index 43929fe58..641247267 100644 --- a/charts/paradedb/README.md.gotmpl +++ b/charts/paradedb/README.md.gotmpl @@ -154,9 +154,19 @@ There is a separate document outlining the recovery procedure here: **[Recovery] There are several configuration examples in the [examples](examples) directory. Refer to them for a basic setup and refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentation/current/) for more advanced configurations. -## Values - {{ template "chart.valuesSection" . }} +| poolers[].name | string | `` | Name of the pooler resource | +| poolers[].instances | number | `1` | The number of replicas we want | +| poolers[].type | [PoolerType][PoolerType] | `rw` | Type of service to forward traffic to. Default: `rw`. | +| poolers[].poolMode | [PgBouncerPoolMode][PgBouncerPoolMode] | `session` | The pool mode. Default: `session`. | +| poolers[].authQuerySecret | [LocalObjectReference][LocalObjectReference] | `{}` | The credentials of the user that need to be used for the authentication query. | +| poolers[].authQuery | string | `{}` | The credentials of the user that need to be used for the authentication query. | +| poolers[].parameters | map[string]string | `{}` | Additional parameters to be passed to PgBouncer - please check the CNPG documentation for a list of options you can configure | +| poolers[].template | [PodTemplateSpec][PodTemplateSpec] | `{}` | The template of the Pod to be created | +| poolers[].template | [ServiceTemplateSpec][ServiceTemplateSpec] | `{}` | Template for the Service to be created | +| poolers[].pg_hba | []string | `{}` | PostgreSQL Host Based Authentication rules (lines to be appended to the pg_hba.conf file) | +| poolers[].monitoring.enabled | bool | `false` | Whether to enable monitoring for the Pooler. | +| poolers[].monitoring.podMonitor.enabled | bool | `true` | Create a podMonitor for the Pooler. | {{ template "chart.maintainersSection" . }} diff --git a/charts/paradedb/examples/image-catalog-ref.yaml b/charts/paradedb/examples/image-catalog-ref.yaml index c5157409c..d702d7fce 100644 --- a/charts/paradedb/examples/image-catalog-ref.yaml +++ b/charts/paradedb/examples/image-catalog-ref.yaml @@ -1,8 +1,8 @@ type: postgresql mode: standalone version: - major: "16" - paradedb: "0.12.1" + major: "17" + paradedb: "0.12.2" cluster: instances: 1 imageCatalogRef: diff --git a/charts/paradedb/examples/image-catalog.yaml b/charts/paradedb/examples/image-catalog.yaml index 778524354..b3125e57f 100644 --- a/charts/paradedb/examples/image-catalog.yaml +++ b/charts/paradedb/examples/image-catalog.yaml @@ -2,7 +2,7 @@ type: postgresql mode: standalone version: major: "17" - paradedb: "0.12.1" + paradedb: "0.12.2" cluster: instances: 1 backups: diff --git a/charts/paradedb/examples/paradedb.yaml b/charts/paradedb/examples/paradedb.yaml index 5b9e46f36..5046469b0 100644 --- a/charts/paradedb/examples/paradedb.yaml +++ b/charts/paradedb/examples/paradedb.yaml @@ -2,7 +2,7 @@ type: paradedb mode: standalone version: postgresql: "17.0" - paradedb: "0.12.1" + paradedb: "0.12.2" cluster: instances: 1 backups: diff --git a/charts/paradedb/templates/cluster.yaml b/charts/paradedb/templates/cluster.yaml index b27c56e72..345d393b5 100644 --- a/charts/paradedb/templates/cluster.yaml +++ b/charts/paradedb/templates/cluster.yaml @@ -76,6 +76,7 @@ spec: {{- toYaml . | nindent 6 }} {{- end }} {{- with .Values.cluster.postgresql.pg_ident }} + pg_ident: {{- toYaml . | nindent 6 }} {{- end }} @@ -85,8 +86,11 @@ spec: {{ end }} {{- with .Values.cluster.postgresql.parameters }} parameters: - {{- toYaml . | nindent 6 }} - {{- end }} + {{ with .parameters }} + {{- toYaml . | nindent 6 }} + {{ end }} + cron.database_name: postgres + {{ end }} {{- if not (empty .Values.cluster.roles) }} managed: diff --git a/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml b/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml index 1a023d5b4..873004416 100644 --- a/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml +++ b/charts/paradedb/test/paradedb-enterprise/01-paradedb-NCC-1701-D_cluster.yaml @@ -1,6 +1,8 @@ type: paradedb-enterprise mode: standalone - +version: + major: "16" + paradedb: "0.12.2" cluster: instances: 1 storage: diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml index 3bae23341..dc565b782 100644 --- a/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml +++ b/charts/paradedb/test/paradedb-minio-backup-restore/01-paradedb_cluster.yaml @@ -1,6 +1,8 @@ type: paradedb mode: standalone - +version: + major: "16" + paradedb: "0.12.2" cluster: instances: 2 storage: diff --git a/charts/paradedb/values.yaml b/charts/paradedb/values.yaml index 1ecfa0814..f7c53dd62 100644 --- a/charts/paradedb/values.yaml +++ b/charts/paradedb/values.yaml @@ -13,10 +13,10 @@ type: paradedb version: # -- PostgreSQL major version to use - postgresql: "17" + postgresql: "16" # -- The ParadeDB version, set in the publish CI workflow from the latest paradedb/paradedb GitHub tag - # -- We default to v0.12.1 for testing and local development - paradedb: "0.12.1" + # -- We default to v0.12.2 for testing and local development + paradedb: "0.12.2" ### # -- Cluster mode of operation. Available modes: @@ -297,9 +297,7 @@ cluster: postgresql: # -- PostgreSQL configuration options (postgresql.conf) - parameters: - # Required by pg_cron - cron.database_name: postgres + parameters: {} # max_connections: 300 # -- Quorum-based Synchronous Replication synchronous: {}