pg-db: fix differential schedule, any repository combinations

percona · Apr 2, 2024 · f49d88e · f49d88e
1 parent 5cbee0a
commit f49d88e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pg-db
 description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL'
 type: application
-version: 2.3.9
+version: 2.3.10
 appVersion: 2.3.1
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:

diff --git a/charts/pg-db/templates/cluster.yaml b/charts/pg-db/templates/cluster.yaml
@@ -300,31 +300,38 @@ spec:
       repos:
       {{- range $repo := .Values.backups.pgbackrest.repos }}
       - name: {{ $repo.name }}
-      {{- if eq $repo.name "repo1" }}
+        {{- if $schedules := $repo.schedules }}
         schedules:
-          full: {{ $repo.schedules.full | quote }}
+          {{- if $schedules.full }}
+          full: {{ $schedules.full | quote }}
+          {{- end }}
+          {{- if $schedules.differential }}
+          differential: {{ $schedules.differential | quote }}
+          {{- end }}
+        {{- end }}
+        {{- if $volume := $repo.volume }}
         volume:
           volumeClaimSpec:
             accessModes:
             - ReadWriteOnce
             resources:
               requests:
-                storage: {{ $repo.volume.volumeClaimSpec.resources.requests.storage }}
-      {{- end }}
-      {{- if eq $repo.name "repo2" }}
+                storage: {{ $volume.volumeClaimSpec.resources.requests.storage }}
+        {{- end }}
+        {{- if $s3 := $repo.s3 }}
         s3:
-          bucket: {{ $repo.s3.bucket }}
-          endpoint: {{ $repo.s3.endpoint }}
-          region: {{ $repo.s3.region }}
-      {{- end }}
-      {{- if eq $repo.name "repo3" }}
+          bucket: {{ $s3.bucket }}
+          endpoint: {{ $s3.endpoint }}
+          region: {{ $s3.region }}
+        {{- end }}
+        {{- if $gcs := $repo.gcs }}
         gcs:
-          bucket: {{ $repo.gcs.bucket }}
-      {{- end }}
-      {{- if eq $repo.name "repo4" }}
+          bucket: {{ $gcs.bucket }}
+        {{- end }}
+        {{- if $azure := $repo.azure }}
         azure:
-          container: {{ $repo.azure.container }}
-      {{- end }}
+          container: {{ $azure.container }}
+        {{- end }}
       {{- end }}
 
 {{- if .Values.patroni }}