From 9bf9085adf8b51136c45ae3238bd59bb2b46cb52 Mon Sep 17 00:00:00 2001
From: tcondeixa <tscondeixa@gmail.com>
Date: Wed, 24 Jun 2026 22:44:03 +0200
Subject: [PATCH] comma separated key:value format for new config

---
 manifests/complete-postgres-manifest.yaml                | 2 ++
 manifests/configmap.yaml                                 | 1 +
 manifests/postgresql-operator-default-configuration.yaml | 4 +---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index 93797e0e1..7ceb97763 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -9,6 +9,8 @@ metadata:
 #    "acid.zalan.do/controller": "second-operator"
 #    "delete-date": "2020-08-31"  # can only be deleted on that day if "delete-date "key is configured
 #    "delete-clustername": "acid-test-cluster"  # can only be deleted when name matches if "delete-clustername" key is configured
+#    "myorg.io/application": "my-app"
+#    "myorg.io/team": "my-team"
 spec:
   dockerImage: ghcr.io/zalando/spilo-18:4.1-p1
   teamId: "acid"
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 1c663c757..4ee556fb6 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -36,6 +36,7 @@ data:
   # delete_annotation_name_key: delete-clustername
   docker_image: ghcr.io/zalando/spilo-18:4.1-p1
   # downscaler_annotations: "deployment-time,downscaler/*"
+  # ebs_volume_tags_from_annotations: "application:myorg.io/application,team:myorg.io/team"
   enable_admin_role_for_users: "true"
   enable_crd_registration: "true"
   enable_cross_namespace_secret: "false"
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index d720ec586..cac3915f6 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -167,11 +167,9 @@ configuration:
     # additional_secret_mount: "some-secret-name"
     # additional_secret_mount_path: "/some/dir"
     aws_region: eu-central-1
+    # ebs_volume_tags_from_annotations: "application:myorg.io/application,team:myorg.io/team"
     enable_ebs_gp3_migration: false
     # enable_ebs_gp3_migration_max_size: 1000
-    # ebs_volume_tags_from_annotations:
-    #   application: zalando.org/owning-application
-    #   team: zalando.org/team
     # gcp_credentials: ""
     # kube_iam_role: ""
     # log_s3_bucket: ""