fix serername

charts/barman-cloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: barman-cloud
-version: 0.2.0
+version: 0.2.5
 description: Barman Cloud Plugin
 keywords:
   - barman-cloud

charts/barman-cloud/README.md

@@ -1,6 +1,6 @@
 # barman-cloud
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-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
 
@@ -27,7 +27,6 @@ Barman Cloud Plugin
 |-----|------|---------|-------------|
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/cloudnative-pg/plugin-barman-cloud","tag":"v0.4.0"}` | Default image |
 | name | string | `"barman-cloud"` | Name override of release |
-| resources | object | `{"requests":{"cpu":"10m","memory":"128Mi"}}` | Default resources |
 | service | object | `{"listenPort":9090}` | Default service |
 
 ----------------------------------------------

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 }}

charts/barman-cloud/templates/common.yaml

@@ -12,7 +12,8 @@ controllers:
       app: {{ .Values.name }}
     replicas: 1
     strategy: Recreate
-    serviceAccountName: plugin-barman-cloud
+    serviceAccount:
+      name: {{ .Release.Name }}-barman-cloud
     pod:
       securityContext:
         runAsNonRoot: true
@@ -52,7 +53,7 @@ controllers:
           seccompProfile:
             type: RuntimeDefault
 serviceAccount:
-  plugin-barman-cloud:
+  barman-cloud:
     enabled: true
 service:
   main:
@@ -80,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) }}

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 }}

charts/barman-cloud/values.yaml

@@ -10,9 +10,3 @@ image:
 # -- Default service
 service:
   listenPort: 9090
-
-# -- Default resources
-resources:
-  requests:
-    cpu: 10m
-    memory: 128Mi

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 6.3.2
+version: 6.4.0
 description: Cloudnative-pg Cluster
 keywords:
   - database

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.0](https://img.shields.io/badge/Version-6.4.0-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 

charts/postgres-cluster/templates/cluster.yaml

@@ -27,11 +27,17 @@ spec:
       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
       parameters:
         barmanObjectName: "{{ include "cluster.name" . }}-{{ .Values.recovery.objectStore.name }}"
+        serverName: {{ include "cluster.recoveryServerName" . }}
   {{ end }}
   storage:
     size: {{ .Values.cluster.storage.size }}

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}}