Merge pull request #41 from small-hack/versions

allign version number inputs with upstream

Author: cloudymax

charts/cloudnative-pg-cluster/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cnpg-cluster
 description: Create postgres tenant clusters managed by the CNPG Operator
 type: application
-version: 0.7.0
+version: 0.8.0
 
 maintainers:
   - name: "cloudymax"

charts/cloudnative-pg-cluster/README.md

@@ -1,6 +1,6 @@
 # cnpg-cluster
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Create postgres tenant clusters managed by the CNPG Operator
 
@@ -15,7 +15,7 @@ Create postgres tenant clusters managed by the CNPG Operator
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| annotations | object | `{"cnpg.io/skipEmptyWalArchiveCheck":"enabled"}` | Cluster annotations |
+| annotations."cnpg.io/skipEmptyWalArchiveCheck" | string | `"enabled"` |  |
 | backup | object | `{}` | if we should backup up this cluster, please see values.yaml for example |
 | bootstrap | object | `{}` | boostrap method. see: https://cloudnative-pg.io/documentation/1.23/bootstrap/ |
 | certificates.client.clientCASecret | string | `""` | name of existing Kubernetes Secret for the postgresql client Certificate Authority cert, ignored if certificates.generate is true |
@@ -32,7 +32,6 @@ Create postgres tenant clusters managed by the CNPG Operator
 | externalClusters | list | `[]` |  |
 | imageCatalog.create | bool | `true` | Whether to provision an image catalog. If imageCatalog.images is empty this option will be ignored. |
 | imageCatalog.images | list | `[]` | List of images to be provisioned in an image catalog. |
-| imageName | string | `"ghcr.io/cloudnative-pg/postgresql:17.0"` | image to use for all tenant pods |
 | instances | int | `3` | number of postgres replicas minimum 1 required |
 | managed | object | `{"roles":[]}` | See https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-RoleConfiguration for explanation of all options |
 | monitoring.enablePodMonitor | bool | `false` | enable monitoring via Prometheus |
@@ -48,6 +47,7 @@ Create postgres tenant clusters managed by the CNPG Operator
 | superuserSecret | string | `""` | name of existing secret to use as superuser redentials will be randomly generated if not specified. |
 | testApp.enabled | bool | `false` |  |
 | type | string | `"postgresql"` | Type of the CNPG database. Available types: * `postgresql` * `postgis` * `timescaledb` |
+| version.postgresql | int | `17` | version of postgres to run in all tenant pods |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/cloudnative-pg-cluster/templates/cnpg_cluster.yaml

@@ -18,7 +18,7 @@ spec:
   postgresUID: {{ include "cluster.postgresUID" . }}
   postgresGID: {{ include "cluster.postgresGID" . }}
   instances: {{ .Values.instances }}
-  imageName: {{ .Values.imageName }}
+  imageName: "ghcr.io/cloudnative-pg/postgresql:{{ .Values.version.postgresql }}"
   enableSuperuserAccess: {{ .Values.enableSuperuserAccess }}
   superuserSecret: {{ .Values.superuserSecret }}
   primaryUpdateStrategy: {{ .Values.primaryUpdateStrategy }}

charts/cloudnative-pg-cluster/values.yaml

@@ -1,16 +1,17 @@
 name: "cnpg"
 
-# -- Cluster annotations
+version:
+  # -- version of postgres to run in all tenant pods
+  postgresql: 17
+
+  # -- Cluster annotations
 annotations:
   cnpg.io/skipEmptyWalArchiveCheck: enabled
 
 # -- number of postgres replicas
 # minimum 1 required
 instances: 3
 
-# -- image to use for all tenant pods
-imageName: ghcr.io/cloudnative-pg/postgresql:17.0
-
 # -- CNPG disables the postgres superuser by default
 # must be explicitly enabled
 enableSuperuserAccess: false