fix sync issues

add barman
fix serername
2025-05-24 12:42:38 -05:00 · 2025-05-24 12:38:46 -05:00 · 2025-05-24 12:07:30 -05:00 · 2025-05-24 12:02:30 -05:00 · 2025-05-24 11:57:30 -05:00 · 2025-05-24 11:52:07 -05:00
11 changed files with 28 additions and 18 deletions
--- a/charts/barman-cloud/Chart.yaml
+++ b/charts/barman-cloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: barman-cloud
-version: 0.2.1
+version: 0.2.5
 description: Barman Cloud Plugin
 keywords:
  - barman-cloud
--- a/charts/barman-cloud/README.md
+++ b/charts/barman-cloud/README.md
@@ -1,6 +1,6 @@
 # barman-cloud

-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: v.0.4.0](https://img.shields.io/badge/AppVersion-v.0.4.0-informational?style=flat-square)
+![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![AppVersion: v.0.4.0](https://img.shields.io/badge/AppVersion-v.0.4.0-informational?style=flat-square)

 Barman Cloud Plugin

--- a/charts/barman-cloud/templates/cluster-role-binding.yaml
+++ b/charts/barman-cloud/templates/cluster-role-binding.yaml
@@ -12,7 +12,7 @@ roleRef:
  name: metrics-auth-role
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-barman-cloud
  namespace: {{ .Release.Namespace }}

 ---
@@ -30,5 +30,5 @@ roleRef:
  name: plugin-barman-cloud
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-barman-cloud
  namespace: {{ .Release.Namespace }}
--- a/charts/barman-cloud/templates/common.yaml
+++ b/charts/barman-cloud/templates/common.yaml
@@ -13,7 +13,7 @@ controllers:
    replicas: 1
    strategy: Recreate
    serviceAccount:
-      name: plugin-barman-cloud
+      name: {{ .Release.Name }}-barman-cloud
    pod:
      securityContext:
        runAsNonRoot: true
@@ -53,7 +53,7 @@ controllers:
          seccompProfile:
            type: RuntimeDefault
 serviceAccount:
-  plugin-barman-cloud:
+  barman-cloud:
    enabled: true
 service:
  main:
@@ -81,11 +81,16 @@ persistence:
          - path: /server
            readOnly: true
            mountPropagation: None
-            subPath: server
+  client-tls:
+    enabled: true
+    type: secret
+    name: {{ .Values.name }}-client-tls
+    advancedMounts:
+      main:
+        main:
          - path: /client
            readOnly: true
            mountPropagation: None
-            subPath: client

 {{ end }}
 {{ $_ := mergeOverwrite .Values (include "barman-cloud.hardcodedValues" . | fromYaml) }}
--- a/charts/barman-cloud/templates/role-binding.yaml
+++ b/charts/barman-cloud/templates/role-binding.yaml
@@ -13,5 +13,5 @@ roleRef:
  name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-barman-cloud
  namespace: {{ .Release.Namespace }}
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 6.3.2
+version: 6.4.2
 description: Cloudnative-pg Cluster
 keywords:
  - database
--- a/charts/postgres-cluster/README.md
+++ b/charts/postgres-cluster/README.md
@@ -1,6 +1,6 @@
 # postgres-cluster

-![Version: 6.3.2](https://img.shields.io/badge/Version-6.3.2-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.4.2](https://img.shields.io/badge/Version-6.4.2-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)

 Cloudnative-pg Cluster

--- a/charts/postgres-cluster/templates/_bootstrap.tpl
+++ b/charts/postgres-cluster/templates/_bootstrap.tpl
@@ -131,6 +131,8 @@ externalClusters:
  - name: {{ include "cluster.recoveryServerName" . }}
    plugin:
      name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: false
      parameters:
        barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
        serverName: {{ include "cluster.recoveryServerName" . }}
--- a/charts/postgres-cluster/templates/_helpers.tpl
+++ b/charts/postgres-cluster/templates/_helpers.tpl
@@ -80,7 +80,7 @@ Generate recovery server name
  {{- if .Values.recovery.recoveryServerName -}}
    {{- .Values.recovery.recoveryServerName -}}
  {{- else -}}
-    {{- printf "%s-backup-%s" (include "cluster.name" .) (toString .Values.recovery.recoveryIndex) | trunc 63 | trimSuffix "-" -}}
+    {{- printf "%s-backup-%s" (include "cluster.name" .) (toString .Values.recovery.objectStore.index) | trunc 63 | trimSuffix "-" -}}
  {{- end }}
 {{- end }}

--- a/charts/postgres-cluster/templates/cluster.yaml
+++ b/charts/postgres-cluster/templates/cluster.yaml
@@ -24,14 +24,23 @@ spec:
  {{ end }}
  {{- range $objectStore := .Values.backup.objectStore }}
    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
      isWALArchiver: {{ $objectStore.isWALArchiver | default true }}
      parameters:
        barmanObjectName: "{{ include "cluster.name" $ }}-{{ $objectStore.name }}-backup"
+        {{- if $objectStore.clusterName }}
+        serverName: "{{ $objectStore.clusterName }}-backup-{{ $objectStore.index }}"
+        {{- else }}
+        serverName: "{{ include "cluster.name" $ }}-backup-{{ $objectStore.index }}"
+        {{- end }}
  {{- end }}
  {{ if eq .Values.recovery.method "objectStore" }}
    - name: barman-cloud.cloudnative-pg.io
+      enabled: true
+      isWALArchiver: false
      parameters:
        barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
+        serverName: {{ include "cluster.recoveryServerName" . }}
  {{ end }}
  storage:
    size: {{ .Values.cluster.storage.size }}
--- a/charts/postgres-cluster/templates/object-store.yaml
+++ b/charts/postgres-cluster/templates/object-store.yaml
@@ -19,11 +19,6 @@ spec:
      name: {{ .endpointCA.name }}
      key: {{ .endpointCA.key }}
    {{- end }}
-    {{- if .clusterName }}
-    serverName: "{{ .clusterName }}-backup-{{ .index }}"
-    {{- else }}
-    serverName: "{{ include "cluster.name" $context }}-backup-{{ .index }}"
-    {{- end }}
    {{- if .wal }}
    wal:
      compression: {{ .wal.compression | default "snappy" }}
@@ -76,7 +71,6 @@ spec:
      name: {{ .Values.recovery.objectStore.endpointCA.name }}
      key: {{ .Values.recovery.objectStore.endpointCA.key }}
    {{- end }}
-    serverName: {{ include "cluster.recoveryServerName" . }}
    wal:
      compression: {{ .Values.recovery.objectStore.wal.compression }}
      {{- with .Values.recovery.objectStore.wal.encryption}}
Author	SHA1	Message	Date
Alex Lebens	78024a129f	fix sync issues All checks were successful release-charts-postgres-cluster / release (push) Successful in 24s Details	2025-05-24 12:42:38 -05:00
Alex Lebens	5cca3b2717	add barman All checks were successful release-charts-postgres-cluster / release (push) Successful in 17s Details	2025-05-24 12:38:46 -05:00
Alex Lebens	a70137cfbd	fix serername All checks were successful release-charts-postgres-cluster / release (push) Successful in 21s Details	2025-05-24 12:07:30 -05:00
Alex Lebens	dc4df55373	fix client mountg All checks were successful release-charts-cloudfbarman-cloudlared / release (push) Successful in 35s Details	2025-05-24 12:02:30 -05:00
Alex Lebens	a3f42e13ce	fix client mount All checks were successful release-charts-cloudfbarman-cloudlared / release (push) Successful in 28s Details	2025-05-24 11:57:30 -05:00
Alex Lebens	a48262f115	upgrade chart All checks were successful release-charts-cloudfbarman-cloudlared / release (push) Successful in 16s Details	2025-05-24 11:52:07 -05:00
Alex Lebens	bd458a3a3d	fix service account All checks were successful release-charts-cloudfbarman-cloudlared / release (push) Successful in 27s Details	2025-05-24 11:49:16 -05:00