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

Signed-off-by: Sebastian Pohl <[email protected]>
cloudnative-pg · Jan 21, 2025 · 9dc4bf6 · 9dc4bf6
1 parent de10713
commit 9dc4bf6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
@@ -45,6 +45,9 @@ spec:
   {{- if .Values.cluster.priorityClassName }}
   priorityClassName: {{ .Values.cluster.priorityClassName }}
   {{- end }}
+  inheritedMetadata:
+    {{- toYaml . | nindent 4 }}
+  {{ end }}
 
   primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
   primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}

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
@@ -12,6 +12,9 @@ spec:
   postgresUID: 1001
   postgresGID: 1002
   instances: 2
+  inheritedMetadata:
+    labels:
+      azure.workload.identity/use: "true"
   postgresql:
     parameters:
       max_connections: "42"

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
@@ -80,6 +80,11 @@ cluster:
     foo: bar
   annotations:
     foo: bar
+  inheritedMetadata:
+    annotations:
+      super.annotation: "super-annotation"
+    labels:
+      azure.workload.identity/use: "true"
   serviceAccountTemplate:
     metadata:
       annotations:

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -298,7 +298,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
 
 backups:
   # -- You need to configure backups manually, so backups are disabled by default.