fix recovery method

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 5.0.3](https://img.shields.io/badge/Version-5.0.3-informational?style=flat-square) ![AppVersion: v1.25.1](https://img.shields.io/badge/AppVersion-v1.25.1-informational?style=flat-square)
+![Version: 5.0.7](https://img.shields.io/badge/Version-5.0.7-informational?style=flat-square) ![AppVersion: v1.25.1](https://img.shields.io/badge/AppVersion-v1.25.1-informational?style=flat-square)
 
 Cloudnative-pg Cluster
 

charts/postgres-cluster/templates/_backup.tpl

@@ -5,7 +5,7 @@ backup:
   barmanObjectStore:
     destinationPath: {{ .Values.backup.destinationPath }}
     endpointURL: {{ .Values.backup.endpointURL }}
-    {{- if .Values.backup.endpointCA }}
+    {{- if .Values.backup.endpointCA.name }}
     endpointCA:
       name: {{ .Values.backup.endpointCA.name }}
       key: {{ .Values.backup.endpointCA.key }}

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -105,7 +105,7 @@ externalClusters:
 externalClusters:
   {{- include "cluster.externalSourceCluster" (list "importSource" .Values.recovery.import.source) | nindent 2 }}
 
-{{- else if eq .Values.mode "backup" }}
+{{- else if eq .Values.recovery.method "backup" }}
   recovery:
     {{- with .Values.recovery.backup.pitrTarget.time }}
     recoveryTarget:
@@ -120,7 +120,7 @@ externalClusters:
     backup:
       name: {{ .Values.recovery.backup.backupName }}
 
-{{- else if eq .Values.mode "objectStore" }}
+{{- else if eq .Values.recovery.method "objectStore" }}
   recovery:
     {{- with .Values.recovery.objectStore.pitrTarget.time }}
     recoveryTarget:
@@ -140,7 +140,7 @@ externalClusters:
       serverName: {{ include "cluster.recoveryServerName" . }}
       endpointURL: {{ .Values.recovery.objectStore.endpointURL }}
       destinationPath: {{ .Values.recovery.objectStore.destinationPath }}
-      {{- if .Values.recovery.objectStore.endpointCA }}
+      {{- if .Values.recovery.objectStore.endpointCA.name }}
       endpointCA:
         name: {{ .Values.recovery.objectStore.endpointCA.name }}
         key: {{ .Values.recovery.objectStore.endpointCA.key }}

charts/postgres-cluster/templates/_helpers.tpl

@@ -26,6 +26,9 @@ helm.sh/chart: {{ include "cluster.chart" $ }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.cluster.additionalLabels }}
+{{ toYaml . }}
+{{- end }}
 {{- end }}
 
 {{/*

charts/postgres-cluster/templates/cluster.yaml

@@ -9,15 +9,12 @@ metadata:
   {{- end }}
   labels:
     {{- include "cluster.labels" . | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   instances: {{ .Values.cluster.instances }}
   {{- include "cluster.image" . | nindent 2 }}
   imageName: "{{ .Values.cluster.image.repository }}:{{ .Values.cluster.image.tag }}"
-  imagePullPolicy: {{ .Values.cluster.image.imagePullPolicy }}
-  {{- with .Values.cluster.image.imagePullSecrets }}
+  imagePullPolicy: {{ .Values.cluster.imagePullPolicy }}
+  {{- with .Values.cluster.imagePullSecrets }}
   imagePullSecrets:
     {{- . | toYaml | nindent 4 }}
   {{- end }}

charts/postgres-cluster/templates/config-map.yaml

@@ -2,14 +2,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "cluster.name" . }}-monitoring
-  namespace: {{ include "cluster.namespace" . }}
+  name: {{ include "cluster.name" $ }}-monitoring
+  namespace: {{ include "cluster.namespace" $ }}
   labels:
     cnpg.io/reload: ""
-    {{- include "cluster.labels" . | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
+    {{- include "cluster.labels" $ | nindent 4 }}
 data:
   custom-queries: |
     {{- range .Values.cluster.monitoring.customQueries }}

charts/postgres-cluster/templates/image-catalog.yaml

@@ -2,13 +2,10 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: ImageCatalog
 metadata:
-  name: {{ include "cluster.name" . }}-image-catalog
-  namespace: {{ include "cluster.namespace" . }}
+  name: {{ include "cluster.name" $ }}-image-catalog
+  namespace: {{ include "cluster.namespace" $ }}
   labels:
-    {{- include "cluster.labels" . | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
+    {{- include "cluster.labels" $ | nindent 4 }}
 spec:
   images:
     {{- range $image := .Values.imageCatalog.images }}

charts/postgres-cluster/templates/poolers.yaml

@@ -6,10 +6,7 @@ metadata:
   name: {{ include "cluster.name" $  }}-pooler-{{ .name }}
   namespace: {{ include "cluster.namespace" $ }}
   labels:
-    {{- include "cluster.labels" . | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
+    {{- include "cluster.labels" $ | nindent 4 }}
 spec:
   cluster:
     name: {{ include "cluster.name" $ }}

charts/postgres-cluster/templates/prometheus-rule.yaml

@@ -6,9 +6,6 @@ metadata:
   namespace: {{ include "cluster.namespace" $ }}
   labels:
     {{- include "cluster.labels" $ | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   groups:
     - name: cloudnative-pg/{{ include "cluster.name" . }}

charts/postgres-cluster/templates/scheduled-backup.yaml

@@ -6,17 +6,14 @@ apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
   name: {{ include "cluster.name" $context }}-{{ .name }}-scheduled-backup
-  namespace: {{ include "cluster.namespace" $ }}
+  namespace: {{ include "cluster.namespace" $context }}
   labels:
-    {{- include "cluster.labels" $ | nindent 4 }}
-  {{- with .Values.cluster.additionalLabels }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
+    {{- include "cluster.labels" $context | nindent 4 }}
 spec:
   immediate: true
   schedule: {{ .schedule | quote }}
   backupOwnerReference: {{ .backupOwnerReference }}
   cluster:
-    name: {{ include "cluster.name" $context }}
+    name: {{ include "cluster.name" $context }}-cluster
 {{ end -}}
 {{ end }}