Skip to content

Commit

Permalink
Fixed cron database name (#61)
Browse files Browse the repository at this point in the history
Co-authored-by: Philippe Noël <[email protected]>

chore: Hardcode version in ParadeDB tests (#66)
  • Loading branch information
itay-grudev authored and philippemnoel committed Dec 19, 2024
1 parent ddafdfe commit ac34111
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 19 deletions.
4 changes: 2 additions & 2 deletions charts/paradedb/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/paradedb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
14 changes: 12 additions & 2 deletions charts/paradedb/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand Down
4 changes: 2 additions & 2 deletions charts/paradedb/examples/image-catalog-ref.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/paradedb/examples/image-catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: postgresql
mode: standalone
version:
major: "17"
paradedb: "0.12.1"
paradedb: "0.12.2"
cluster:
instances: 1
backups:
Expand Down
2 changes: 1 addition & 1 deletion charts/paradedb/examples/paradedb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type: paradedb
mode: standalone
version:
postgresql: "17.0"
paradedb: "0.12.1"
paradedb: "0.12.2"
cluster:
instances: 1
backups:
Expand Down
8 changes: 6 additions & 2 deletions charts/paradedb/templates/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ spec:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.cluster.postgresql.pg_ident }}

pg_ident:
{{- toYaml . | nindent 6 }}
{{- end }}
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
type: paradedb-enterprise
mode: standalone

version:
major: "16"
paradedb: "0.12.2"
cluster:
instances: 1
storage:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
type: paradedb
mode: standalone

version:
major: "16"
paradedb: "0.12.2"
cluster:
instances: 2
storage:
Expand Down
10 changes: 4 additions & 6 deletions charts/paradedb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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: {}
Expand Down

0 comments on commit ac34111

Please sign in to comment.