fix name helper

charts/postgres-cluster/Chart.yaml

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

charts/postgres-cluster/README.md

@@ -1,6 +1,6 @@
 # postgres-cluster
 
-![Version: 6.0.4](https://img.shields.io/badge/Version-6.0.4-informational?style=flat-square) ![AppVersion: v1.26.0](https://img.shields.io/badge/AppVersion-v1.26.0-informational?style=flat-square)
+![Version: 6.1.0](https://img.shields.io/badge/Version-6.1.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
 
@@ -19,19 +19,19 @@ Cloudnative-pg Cluster
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| backup | object | `{"enabled":false,"method":"objectStore","objectStore":[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"","endpointCA":{"create":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}],"scheduledBackups":[{"backupName":"external","backupOwnerReference":"self","name":"daily-backup","plugin":"barman-cloud.cloudnative-pg.io","schedule":"0 0 */3 * *","suspend":false}]}` | Backup settings |
+| backup | object | `{"enabled":true,"method":"objectStore","objectStore":[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"s3://postgres-backups","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"https://nyc3.digitaloceanspaces.com","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}],"scheduledBackups":[{"backupName":"external","backupOwnerReference":"self","name":"daily-backup","plugin":"barman-cloud.cloudnative-pg.io","schedule":"0 0 */3 * *","suspend":false}]}` | Backup settings |
-| backup.enabled | bool | `false` | You need to configure backups manually, so backups are disabled by default. |
+| backup.enabled | bool | `true` | You need to configure backups manually, so backups are disabled by default. |
 | backup.method | string | `"objectStore"` | Method to create backups, options currently are only objectStore |
-| backup.objectStore | list | `[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"","endpointCA":{"create":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}]` | Options for object store backups |
+| backup.objectStore | list | `[{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"destinationPath":"s3://postgres-backups","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"https://nyc3.digitaloceanspaces.com","index":1,"isWALArchiver":true,"name":"external","retentionPolicy":"30d","wal":{"compression":"snappy","encryption":"","maxParallel":1}}]` | Options for object store backups |
 | backup.objectStore[0].clusterName | string | `""` | Override the name of the backup cluster, defaults to "cluster.name" |
 | backup.objectStore[0].data.compression | string | `"snappy"` | Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
 | backup.objectStore[0].data.encryption | string | `""` | Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
 | backup.objectStore[0].data.jobs | int | `1` | Number of data files to be archived or restored in parallel. |
-| backup.objectStore[0].destinationPath | string | `""` | Overrides the provider specific default path. Defaults to: S3: s3://<bucket><path> Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path> Google: gs://<bucket><path> |
+| backup.objectStore[0].destinationPath | string | `"s3://postgres-backups"` | Overrides the provider specific default path. Defaults to: S3: s3://<bucket><path> Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path> Google: gs://<bucket><path> |
-| backup.objectStore[0].endpointCA | object | `{"create":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
+| backup.objectStore[0].endpointCA | object | `{"create":false,"enabled":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
 | backup.objectStore[0].endpointCA.create | bool | `false` | Creates a secret with the given value if true, otherwise uses an existing secret. |
 | backup.objectStore[0].endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
-| backup.objectStore[0].endpointURL | string | `""` | Overrides the provider specific default endpoint. Defaults to: S3: https://s3.<region>.amazonaws.com" |
+| backup.objectStore[0].endpointURL | string | `"https://nyc3.digitaloceanspaces.com"` | Overrides the provider specific default endpoint. Defaults to: S3: https://s3.<region>.amazonaws.com" |
 | backup.objectStore[0].index | int | `1` | Generate external cluster name, uses: {{ .Release.Name }}-postgresql-<major version>-backup-index-{{ index }} |
 | backup.objectStore[0].isWALArchiver | bool | `true` | Specificies if this backup will do WALs |
 | backup.objectStore[0].name | string | `"external"` | Object store backup name |
@@ -85,7 +85,7 @@ Cloudnative-pg Cluster
 | nameOverride | string | `""` | Override the name of the cluster |
 | namespaceOverride | string | `""` | Override the namespace of the chart |
 | poolers | list | `[]` | List of PgBouncer poolers |
-| recovery | object | `{"backup":{"backupName":"","database":"app","owner":"","pitrTarget":{"time":""}},"import":{"databases":[],"pgDumpExtraOptions":[],"pgRestoreExtraOptions":[],"postImportApplicationSQL":[],"roles":[],"schemaOnly":false,"source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":"app"},"type":"microservice"},"method":"backup","objectStore":{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"database":"app","destinationPath":"","endpointCA":{"create":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"name":"recovery","owner":"","pitrTarget":{"time":""},"wal":{"compression":"snappy","encryption":"","maxParallel":1}},"pgBaseBackup":{"database":"app","owner":"","secret":"","source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":""}}}` | Recovery settings when booting cluster from external cluster |
+| recovery | object | `{"backup":{"backupName":"","database":"app","owner":"","pitrTarget":{"time":""}},"import":{"databases":[],"pgDumpExtraOptions":[],"pgRestoreExtraOptions":[],"postImportApplicationSQL":[],"roles":[],"schemaOnly":false,"source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":"app"},"type":"microservice"},"method":"backup","objectStore":{"clusterName":"","data":{"compression":"snappy","encryption":"","jobs":1},"database":"app","destinationPath":"","endpointCA":{"create":false,"enabled":false,"key":"","name":""},"endpointCredentials":"","endpointURL":"","index":1,"name":"recovery","owner":"","pitrTarget":{"time":""},"wal":{"compression":"snappy","encryption":"","maxParallel":1}},"pgBaseBackup":{"database":"app","owner":"","secret":"","source":{"database":"app","host":"","passwordSecret":{"create":false,"key":"password","name":"","value":""},"port":5432,"sslCertSecret":{"key":"","name":""},"sslKeySecret":{"key":"","name":""},"sslMode":"verify-full","sslRootCertSecret":{"key":"","name":""},"username":""}}}` | Recovery settings when booting cluster from external cluster |
 | recovery.backup.backupName | string | `""` | Name of the backup to recover from. |
 | recovery.backup.database | string | `"app"` | Name of the database used by the application. Default: `app`. |
 | recovery.backup.owner | string | `""` | Name of the owner of the database in the instance to be used by applications. Defaults to the value of the `database` key. |
@@ -110,7 +110,7 @@ Cloudnative-pg Cluster
 | recovery.objectStore.data.jobs | int | `1` | Number of data files to be archived or restored in parallel. |
 | recovery.objectStore.database | string | `"app"` | Name of the database used by the application. Default: `app`. |
 | recovery.objectStore.destinationPath | string | `""` | Overrides the provider specific default path. Defaults to: S3: s3://<bucket><path> Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path> Google: gs://<bucket><path> |
-| recovery.objectStore.endpointCA | object | `{"create":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
+| recovery.objectStore.endpointCA | object | `{"create":false,"enabled":false,"key":"","name":""}` | Specifies a CA bundle to validate a privately signed certificate. |
 | recovery.objectStore.endpointCA.create | bool | `false` | Creates a secret with the given value if true, otherwise uses an existing secret. |
 | recovery.objectStore.endpointCredentials | string | `""` | Specifies secret that contains S3 credentials, should contain the keys ACCESS_KEY_ID and ACCESS_SECRET_KEY |
 | recovery.objectStore.endpointURL | string | `""` | Overrides the provider specific default endpoint. Defaults to: S3: https://s3.<region>.amazonaws.com" Leave empty if using the default S3 endpoint |

charts/postgres-cluster/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "cluster.name" -}}
-  {{- if not (empty .Values.nameOverride ) }}
+  {{- if .Values.nameOverride }}
     {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
   {{- else }}
     {{- printf "%s-postgresql-%s" .Release.Name ((semver .Values.cluster.image.tag).Major | toString) | trunc 63 | trimSuffix "-" -}}

charts/postgres-cluster/templates/cluster.yaml

@@ -26,9 +26,9 @@ spec:
   {{ $context := . -}}
   {{ range .Values.backup.objectStore -}}
     - name: barman-cloud.cloudnative-pg.io
-      isWALArchiver: {{ $context.isWALArchiver }}
+      isWALArchiver: {{ .isWALArchiver }}
       parameters:
-        barmanObjectName: "{{ include "cluster.name" . }}-{{ $context.name }}-backup"
+        barmanObjectName: "{{ include "cluster.name" $context }}-{{ .name }}-backup"
   {{ end -}}
   {{ end }}
   {{ if eq .Values.recovery.method "objectStore" }}

charts/postgres-cluster/templates/object-store.yaml

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

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

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

charts/postgres-cluster/values.yaml

@@ -275,9 +275,11 @@ recovery:
 
     # -- Specifies a CA bundle to validate a privately signed certificate.
     endpointCA:
+      enabled: false
 
       # -- Creates a secret with the given value if true, otherwise uses an existing secret.
       create: false
+
       name: ""
       key: ""
 
@@ -418,7 +420,7 @@ recovery:
 backup:
 
   # -- You need to configure backups manually, so backups are disabled by default.
-  enabled: false
+  enabled: true
 
   # -- Method to create backups, options currently are only objectStore
   method: objectStore
@@ -433,16 +435,19 @@ backup:
       # S3: s3://<bucket><path>
       # Azure: https://<storageAccount>.<serviceName>.core.windows.net/<containerName><path>
       # Google: gs://<bucket><path>
-      destinationPath: ""
+      destinationPath: s3://postgres-backups
 
       # -- Overrides the provider specific default endpoint. Defaults to:
       # S3: https://s3.<region>.amazonaws.com"
-      endpointURL: ""  # Leave empty if using the default S3 endpoint
+      endpointURL: https://nyc3.digitaloceanspaces.com
 
       # -- Specifies a CA bundle to validate a privately signed certificate.
       endpointCA:
+        enabled: false
+
         # -- Creates a secret with the given value if true, otherwise uses an existing secret.
         create: false
+
         name: ""
         key: ""