From 59986327ae1646b563ea3a4f0d9f749675c15316 Mon Sep 17 00:00:00 2001
From: this-is-tobi <this-is-tobi@proton.me>
Date: Wed, 16 Oct 2024 13:24:38 +0200
Subject: [PATCH] fix: :bug: fix compression on cnpg clusters

---
 roles/gitlab/templates/pg-cluster-gitlab.yaml.j2     | 2 +-
 roles/harbor/templates/pg-cluster-harbor.yaml.j2     | 2 +-
 roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2 b/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2
index a25c1f27..51a5117a 100644
--- a/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2
+++ b/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2
@@ -113,13 +113,13 @@ spec:
         secretAccessKey:
           name: "{{ dsc.global.backup.s3.credentials.name }}"
           key: "{{ dsc.global.backup.s3.credentials.secretAccessKey.key }}"
-    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% if dsc.global.backup.cnpg.compression != 'none' %}
       data:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
       wal:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
 {% endif %}
+    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% else %}
   backup: null
 {% endif %}
diff --git a/roles/harbor/templates/pg-cluster-harbor.yaml.j2 b/roles/harbor/templates/pg-cluster-harbor.yaml.j2
index da9fa388..905c90bd 100644
--- a/roles/harbor/templates/pg-cluster-harbor.yaml.j2
+++ b/roles/harbor/templates/pg-cluster-harbor.yaml.j2
@@ -113,13 +113,13 @@ spec:
         secretAccessKey:
           name: "{{ dsc.global.backup.s3.credentials.name }}"
           key: "{{ dsc.global.backup.s3.credentials.secretAccessKey.key }}"
-    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% if dsc.global.backup.cnpg.compression != 'none' %}
       data:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
       wal:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
 {% endif %}
+    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% else %}
   backup: null
 {% endif %}
diff --git a/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 b/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2
index 368c25ae..d1bdac55 100644
--- a/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2
+++ b/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2
@@ -113,13 +113,13 @@ spec:
         secretAccessKey:
           name: "{{ dsc.global.backup.s3.credentials.name }}"
           key: "{{ dsc.global.backup.s3.credentials.secretAccessKey.key }}"
-    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% if dsc.global.backup.cnpg.compression != 'none' %}
       data:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
       wal:
         compression: "{{ dsc.global.backup.cnpg.compression }}"
 {% endif %}
+    retentionPolicy: "{{ dsc.global.backup.cnpg.retentionPolicy }}"
 {% else %}
   backup: null
 {% endif %}