Merge branch 'main' into patch-1

cloudnative-pg · Mar 12, 2024 · b172c55 · b172c55
2 parents f493c5b + aab8c3a
commit b172c55
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -33,7 +33,7 @@ jobs:
           echo "${{ secrets.PGP_KEY_PASSPHRASE }}" > /tmp/passphrase-file.txt
 
       - name: Set up Helm
-        uses: azure/setup-helm@29960d0f5f19214b88e1d9ba750a9914ab0f1a2f # v4.0.0
+        uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0
         with:
           version: v3.14.1
 

diff --git a/charts/cluster/README.md b/charts/cluster/README.md
@@ -152,6 +152,8 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | cluster.monitoring.enabled | bool | `false` |  |
 | cluster.monitoring.podMonitor.enabled | bool | `true` |  |
 | cluster.monitoring.prometheusRule.enabled | bool | `true` |  |
+| cluster.postgresGID | int | `26` | The GID of the postgres user inside the image, defaults to 26 |
+| cluster.postgresUID | int | `26` | The UID of the postgres user inside the image, defaults to 26 |
 | cluster.postgresql | object | `{}` | Configuration of the PostgreSQL server See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration |
 | cluster.primaryUpdateMethod | string | `"switchover"` | Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated. It can be switchover (default) or in-place (restart). |
 | cluster.primaryUpdateStrategy | string | `"unsupervised"` | Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated: it can be automated (unsupervised - default) or manual (supervised) |

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
@@ -19,6 +19,8 @@ spec:
   imagePullSecrets:
     {{- . | toYaml | nindent 4 }}
   {{- end }}
+  postgresUID: {{ .Values.cluster.postgresUID }}
+  postgresGID: {{ .Values.cluster.postgresGID }}
   storage:
     size: {{ .Values.cluster.storage.size }}
     storageClass: {{ .Values.cluster.storage.storageClass }}

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -176,6 +176,12 @@
                 "postgresql": {
                     "type": "object"
                 },
+                "postgresUID": {
+                    "type": "integer"
+                },
+                "postgresGID": {
+                    "type": "integer"
+                },
                 "primaryUpdateMethod": {
                     "type": "string"
                 },

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -90,6 +90,12 @@ cluster:
     size: 8Gi
     storageClass: ""
 
+  # -- The UID of the postgres user inside the image, defaults to 26
+  postgresUID: 26
+
+  # -- The GID of the postgres user inside the image, defaults to 26
+  postgresGID: 26
+
   # -- Resources requirements of every generated Pod.
   # Please refer to https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for more information.
   # We strongly advise you use the same setting for limits and requests so that your cluster pods are given a Guaranteed QoS.