feat(cluster): Add support for passing inheritedMetadata to Cluster spec

charts/cluster/README.md

@@ -162,6 +162,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | cluster.imageName | string | `""` | Name of the container image, supporting both tags (<image>:<tag>) and digests for deterministic and repeatable deployments: <image>:<tag>@sha256:<digestValue> |
 | cluster.imagePullPolicy | string | `"IfNotPresent"` | Image pull policy. One of Always, Never or IfNotPresent. If not defined, it defaults to IfNotPresent. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images |
 | cluster.imagePullSecrets | list | `[]` | The list of pull secrets to be used to pull the images. See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-LocalObjectReference |
+| cluster.inheritedMetadata | object | `{}` | Metadata to be inherited by all resources related to a Cluster, annotations and labels defined here will be added to all cluster resources See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-EmbeddedObjectMetadata |
 | cluster.initdb | object | `{}` | BootstrapInitDB is the configuration of the bootstrap process when initdb is used. See: https://cloudnative-pg.io/documentation/current/bootstrap/ See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-bootstrapinitdb |
 | cluster.instances | int | `3` | Number of instances |
 | cluster.logLevel | string | `"info"` | The instances' log level, one of the following values: error, warning, info (default), debug, trace |

charts/cluster/templates/cluster.yaml

@@ -53,6 +53,10 @@ spec:
   {{- if .Values.cluster.priorityClassName }}
   priorityClassName: {{ .Values.cluster.priorityClassName }}
   {{- end }}
+  {{- with .Values.cluster.inheritedMetadata }}
+  inheritedMetadata:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 
   primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
   primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}

charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml

@@ -12,6 +12,9 @@ spec:
   postgresUID: 1001
   postgresGID: 1002
   instances: 2
+  inheritedMetadata:
+    labels:
+      azure.workload.identity/use: "true"
   postgresql:
     ldap:
       server: 'openldap.default.svc.cluster.local'

charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml

@@ -123,6 +123,11 @@ cluster:
     foo: bar
   annotations:
     foo: bar
+  inheritedMetadata:
+    annotations:
+      super.annotation: "super-annotation"
+    labels:
+      azure.workload.identity/use: "true"
   serviceAccountTemplate:
     metadata:
       annotations:

charts/cluster/values.schema.json

@@ -219,6 +219,9 @@
                 "imagePullSecrets": {
                     "type": "array"
                 },
+                "inheritedMetadata": {
+                    "type": "object"
+                },
                 "initdb": {
                     "type": "object"
                 },

charts/cluster/values.yaml

@@ -405,6 +405,15 @@ cluster:
 
   additionalLabels: {}
   annotations: {}
+  # -- Metadata to be inherited by all resources related to a Cluster, annotations and labels defined here will be added to all cluster resources
+  # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-EmbeddedObjectMetadata
+  inheritedMetadata: {}
+  #  annotations:
+  #    my.custom: annotation
+  #    another.custom: annotation
+  #  labels:
+  #    my.custom: label
+  #    another.custom: label
 
   console:
     # -- Deploys a console StatefulSet to run long-running commands against the cluster (e.g. `CREATE INDEX`).