From f15194ac809b651e2479d3f5e4bba0cb055d256a Mon Sep 17 00:00:00 2001 From: Leonardo Cecchi Date: Fri, 21 Mar 2025 14:43:57 +0100 Subject: [PATCH] fix: custom CA support for retention policies Signed-off-by: Leonardo Cecchi --- internal/cnpgi/instance/retention.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/cnpgi/instance/retention.go b/internal/cnpgi/instance/retention.go index 4a643b1..6b68dfb 100644 --- a/internal/cnpgi/instance/retention.go +++ b/internal/cnpgi/instance/retention.go @@ -109,12 +109,14 @@ func (c *CatalogMaintenanceRunnable) maintenance( return nil } - env, err := barmanCredentials.EnvSetBackupCloudCredentials( + env, err := barmanCredentials.EnvSetCloudCredentialsAndCertificates( ctx, c.Client, objectStore.Namespace, &objectStore.Spec.Configuration, - common.MergeEnv(os.Environ(), common.GetRestoreCABundleEnv(&objectStore.Spec.Configuration))) + os.Environ(), + common.BuildCertificateFilePath(objectStore.Name), + ) if err != nil { contextLogger.Error(err, "while setting backup cloud credentials") return err