Merge branch 'main' into fix/extra_check_inheritFromIAMRole

cloudnative-pg · Feb 4, 2025 · 0ca25f4 · 0ca25f4
2 parents bb07039 + b7fe14f
commit 0ca25f4
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 6 deletions.
diff --git a/charts/cluster/Chart.yaml b/charts/cluster/Chart.yaml
@@ -18,7 +18,7 @@ name: cluster
 description: Deploys and manages a CloudNativePG cluster and its associated resources.
 icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
 type: application
-version: 0.2.0
+version: 0.2.1
 sources:
   - https://github.com/cloudnative-pg/charts
 keywords:

diff --git a/charts/cluster/README.md b/charts/cluster/README.md
@@ -1,6 +1,6 @@
 # cluster
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 > **Warning**
 > ### This chart is under active development.
@@ -100,7 +100,7 @@ below. Refer to the table for the full list of parameters and place the configur
 Recovery
 --------
 
-There is a separate document outlining the recovery procedure here: **[Recovery](docs/Recovery.md)**
+There is a separate document outlining the recovery procedure here: **[Recovery](docs/recovery.md)**
 
 Examples
 --------
@@ -184,6 +184,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | cluster.resources | object | `{}` | 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. See: https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/ |
 | cluster.roles | list | `[]` | This feature enables declarative management of existing roles, as well as the creation of new roles if they are not already present in the database. See: https://cloudnative-pg.io/documentation/current/declarative_role_management/ |
 | cluster.serviceAccountTemplate | object | `{}` | Configure the metadata of the generated service account |
+| cluster.services | object | `{}` | Customization of service definions. Please refer to https://cloudnative-pg.io/documentation/1.24/service_management/ |
 | cluster.storage.size | string | `"8Gi"` |  |
 | cluster.storage.storageClass | string | `""` |  |
 | cluster.superuserSecret | string | `""` |  |
@@ -281,5 +282,3 @@ TODO
 * IAM Role for S3 Service Account
 * Automatic provisioning of a Alert Manager configuration
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
@@ -86,8 +86,12 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 
-  {{- if not (empty .Values.cluster.roles) }}
+  {{- if not (and (empty .Values.cluster.roles) (empty .Values.cluster.services)) }}
   managed:
+    {{- with .Values.cluster.services }}
+    services:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
     {{- with .Values.cluster.roles }}
     roles:
       {{- toYaml . | nindent 6 }}

diff --git a/...er/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml b/...er/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml
@@ -84,6 +84,18 @@ spec:
         inRoles:
           - pg_monitor
           - pg_signal_backend
+    services:
+      additional:
+        - selectorType: rw
+          serviceTemplate:
+            metadata:
+              name: "test-lb"
+              labels:
+                test-label: "true"
+              annotations:
+                test-annotation: "true"
+            spec:
+              type: LoadBalancer
   serviceAccountTemplate:
     metadata:
       annotations:

diff --git a/...s/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml b/...s/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
@@ -45,6 +45,18 @@ cluster:
   enableSuperuserAccess: true
   superuserSecret: supersecret-secret
   enablePDB: false
+  services:
+    additional:
+      - selectorType: rw
+        serviceTemplate:
+          metadata:
+            name: "test-lb"
+            labels:
+              test-label: "true"
+            annotations:
+              test-annotation: "true"
+          spec:
+            type: LoadBalancer
   roles:
      - name: dante
        ensure: present

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -106,6 +106,9 @@
                         "bucket": {
                             "type": "string"
                         },
+                        "inheritFromIAMRole": {
+                            "type": "boolean"
+                        },
                         "path": {
                             "type": "string"
                         },
@@ -297,6 +300,9 @@
                 "serviceAccountTemplate": {
                     "type": "object"
                 },
+                "services": {
+                    "type": "object"
+                },
                 "storage": {
                     "type": "object",
                     "properties": {
@@ -538,6 +544,9 @@
                         "bucket": {
                             "type": "string"
                         },
+                        "inheritFromIAMRole": {
+                            "type": "boolean"
+                        },
                         "path": {
                             "type": "string"
                         },

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -164,6 +164,9 @@ cluster:
   # -- The GID of the postgres user inside the image, defaults to 26
   postgresGID: -1
 
+  # -- Customization of service definions. Please refer to https://cloudnative-pg.io/documentation/1.24/service_management/
+  services: {}
+
   # -- 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.