fix name helper

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.0.2](https://img.shields.io/badge/Version-6.0.2-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.0.5](https://img.shields.io/badge/Version-6.0.5-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/object-store.yaml

@@ -5,24 +5,24 @@
 apiVersion: barmancloud.cnpg.io/v1
 kind: ObjectStore
 metadata:
-  name: "{{ include "cluster.name" . }}-{{ $context.name }}-backup"
+  name: "{{ include "cluster.name" $context }}-{{ $context.name }}-backup"
-  namespace: {{ include "cluster.namespace" . }}
+  namespace: {{ include "cluster.namespace" $context }}
   labels:
-    {{- include "cluster.labels" . | nindent 4 }}
+    {{- include "cluster.labels" $context | nindent 4 }}
 spec:
   retentionPolicy: {{ $context.retentionPolicy }}
   configuration:
     destinationPath: {{ $context.destinationPath }}
     endpointURL: {{ $context.endpointURL }}
-    {{- if $context.endpointCA.name }}
+    {{- if not (empty $context.endpointCA.name) }}
     endpointCA:
       name: {{ $context.endpointCA.name }}
       key: {{ $context.endpointCA.key }}
     {{- end }}
-    {{- if $context.clusterName }}
+    {{- if not (empty $context.clusterName) }}
     serverName: "{{ $context.clusterName }}-backup-{{ $context.index }}"
     {{- else }}
-    serverName: "{{ include "cluster.name" . }}-backup-{{ $context.index }}"
+    serverName: "{{ include "cluster.name" $context }}-backup-{{ $context.index }}"
     {{- end }}
     wal:
       compression: {{ $context.wal.compression }}
@@ -38,17 +38,17 @@ spec:
       jobs: {{ $context.data.jobs }}
     s3Credentials:
       accessKeyId:
-        {{- if $context.endpointCredentials }}
+        {{- if not (empty $context.endpointCredentials) }}
         name: {{ $context.endpointCredentials }}
         {{- else }}
-        name: {{- printf "%s-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
+        name: {{- printf "%s-backup-secret" (include "cluster.name" $context) | trunc 63 | trimSuffix "-" -}}
         {{- end }}
         key: ACCESS_KEY_ID
       secretAccessKey:
-        {{- if $context.endpointCredentials }}
+        {{- if not (empty $context.endpointCredentials) }}
         name: {{ $context.endpointCredentials }}
         {{- else }}
-        name: {{- printf "%s-backup-secret" (include "cluster.name" .) | trunc 63 | trimSuffix "-" -}}
+        name: {{- printf "%s-backup-secret" (include "cluster.name" $context) | trunc 63 | trimSuffix "-" -}}
         {{- end }}
         key: ACCESS_SECRET_KEY
 {{ end -}}
@@ -67,7 +67,7 @@ spec:
   configuration:
     destinationPath: {{ .Values.recovery.objectStore.destinationPath }}
     endpointURL: {{ .Values.recovery.objectStore.endpointURL }}
-    {{- if .Values.recovery.objectStore.endpointCA.name }}
+    {{- if not (empty .Values.recovery.objectStore.endpointCA.name) }}
     endpointCA:
       name: {{ .Values.recovery.objectStore.endpointCA.name }}
       key: {{ .Values.recovery.objectStore.endpointCA.key }}

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

@@ -5,8 +5,8 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: "{{ include "cluster.name" . }}-{{ $context.name }}-scheduled-backup"
+  name: "{{ include "cluster.name" $context }}-{{ $context.name }}-scheduled-backup"
-  namespace: {{ include "cluster.namespace" . }}
+  namespace: {{ include "cluster.namespace" $context }}
   labels:
     {{- include "cluster.labels" $context | nindent 4 }}
 spec:
@@ -15,11 +15,11 @@ spec:
   schedule: {{ $context.schedule | quote }}
   backupOwnerReference: {{ $context.backupOwnerReference }}
   cluster:
-    name: {{ include "cluster.name" . }}-cluster
+    name: {{ include "cluster.name" $context }}-cluster
   method: plugin
   pluginConfiguration:
     name: {{ $context.plugin }}
     parameters:
-      barmanObjectName: "{{ include "cluster.name" . }}-{{ $context.backupName }}-backup"
+      barmanObjectName: "{{ include "cluster.name" $context }}-{{ $context.backupName }}-backup"
 {{ end -}}
 {{ end }}