From 705d682b1fa863893b4b3967cd1c70cb31186fa1 Mon Sep 17 00:00:00 2001
From: Sebastian Pohl <sebastian.pohl@materna.group>
Date: Mon, 20 Jan 2025 06:10:28 +0100
Subject: [PATCH] feat(cluster): Add support for passing inheritedMetadata to
 Cluster spec

Signed-off-by: Sebastian Pohl <sebastian.pohl@materna.group>
---
 charts/cluster/templates/cluster.yaml         |   3 +++
 ..._default_configuration_cluster-assert.yaml |   3 +++
 .../01-non_default_configuration_cluster.yaml |   5 +++++
 charts/cluster/values.schema.json             | Bin 20072 -> 42004 bytes
 charts/cluster/values.yaml                    |  10 +++++++++-
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
index 715cf0094..4d15355c5 100644
--- 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/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml b/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml
index b8ff318d5..abcffcfdf 100644
--- a/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml
+++ b/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:
     parameters:
       max_connections: "42"
diff --git a/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml b/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
index 68ccba903..c5c643cce 100644
--- a/charts/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
+++ b/charts/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
index cb181a7378c1edee2deed34ab725cd5c7669e163..eb2bd2a73226b09cb8176b2268e709280704a44a 100644
GIT binary patch
literal 42004
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
aoH1+lhO3-;*YP#ux=G%u&xCuz|NjHxXc2Az

literal 20072
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

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
index ed16dacb4..6ab806b98 100644
--- 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.