Merge remote-tracking branch 'upstream/main'

Author: ehbello

charts/cluster/Chart.yaml

@@ -21,7 +21,7 @@ name: cluster
 description: Deploys and manages a CloudNativePG cluster and its associated resources.
 icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
 type: application
-version: 0.4.0
+version: 0.5.0
 sources:
   - https://github.com/cloudnative-pg/charts
 keywords:

charts/cluster/README.md

@@ -1,6 +1,6 @@
 # cluster
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 > **Warning**
 > ### This chart is under active development.
@@ -274,7 +274,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | recovery.s3.secretKey | string | `""` |  |
 | recovery.secret.create | bool | `true` | Whether to create a secret for the backup credentials |
 | recovery.secret.name | string | `""` | Name of the backup credentials secret |
-| replica.bootstrap.database | string | `"app"` | Name of the database used by the application. Default: `app`. |
+| replica.bootstrap.database | string | `""` | Name of the database used by the application |
 | replica.bootstrap.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. |
 | replica.bootstrap.secret | string | `""` | Name of the secret containing the initial credentials for the owner of the user database. If empty a new secret will be created from scratch |
 | replica.bootstrap.source | string | `""` | One of `object_store` or `pg_basebackup`. Method to use for bootstrap. |
@@ -289,6 +289,8 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | replica.origin.objectStore.azure.storageSasToken | string | `""` |  |
 | replica.origin.objectStore.clusterName | string | `""` | The original cluster name when used in backups. Also known as serverName. |
 | replica.origin.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> |
+| replica.origin.objectStore.endpointCA | object | `{"create":false,"key":"","name":"","value":""}` | Specifies a CA bundle to validate a privately signed certificate. |
+| replica.origin.objectStore.endpointCA.create | bool | `false` | Creates a secret with the given value if true, otherwise uses an existing secret. |
 | replica.origin.objectStore.google.applicationCredentials | string | `""` |  |
 | replica.origin.objectStore.google.bucket | string | `""` |  |
 | replica.origin.objectStore.google.gkeEnvironment | bool | `false` |  |
@@ -302,7 +304,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | replica.origin.objectStore.s3.secretKey | string | `""` |  |
 | replica.origin.objectStore.secret.create | bool | `true` | Whether to create a secret for the backup credentials |
 | replica.origin.objectStore.secret.name | string | `""` | Name of the backup credentials secret |
-| replica.origin.pg_basebackup.database | string | `"app"` |  |
+| replica.origin.pg_basebackup.database | string | `""` |  |
 | replica.origin.pg_basebackup.host | string | `""` |  |
 | replica.origin.pg_basebackup.passwordSecret.key | string | `""` |  |
 | replica.origin.pg_basebackup.passwordSecret.name | string | `""` |  |

charts/cluster/templates/_bootstrap.tpl

@@ -88,23 +88,8 @@ bootstrap:
       name: {{ .Values.recovery.backupName }}
     {{- else if and (eq .Values.recovery.method "object_store") (eq (include "cluster.useBarmanCloudPlugin" .) "false") }}
     source: objectStoreRecoveryCluster
-
-externalClusters:
-  - name: objectStoreRecoveryCluster
-    barmanObjectStore:
-      serverName: {{ .Values.recovery.clusterName }}
-      {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.recovery "secretPrefix" "recovery" -}}
-      {{- include "cluster.barmanObjectStoreConfig" $d | indent 4 }}
-    {{- else if and (eq .Values.recovery.method "object_store") (eq (include "cluster.useBarmanCloudPlugin" .) "true") }}
+    {{- else }}
     source: origin
-
-externalClusters:
-    - name: origin
-      plugin:
-        name: barman-cloud.cloudnative-pg.io
-        parameters:
-          barmanObjectName: {{ include "cluster.fullname" $  }}-object-store
-          serverName: {{ .Values.recovery.clusterName |  default (include "cluster.fullname" .) }}
     {{- end }}
   {{- end }}
 {{- else if eq .Values.mode "replica" }}

charts/cluster/templates/_external_clusters.tpl

@@ -1,27 +1,31 @@
 {{- define "cluster.externalClusters" -}}
-{{- if eq .Values.mode "standalone" }}
-externalClusters: []
+externalClusters:
+{{- if eq .Values.mode "standalone" }} []
 {{- else if eq .Values.mode "recovery" }}
   {{- if eq .Values.recovery.method "pg_basebackup" }}
-externalClusters:
   - name: pgBaseBackupSource
      {{- include "cluster.externalSourceCluster" .Values.recovery.pgBaseBackup.source | nindent 4 }}
   {{- else if eq .Values.recovery.method "import" }}
-externalClusters:
   - name: importSource
      {{- include "cluster.externalSourceCluster" .Values.recovery.import.source | nindent 4 }}
   {{- else if eq .Values.recovery.method "object_store" }}
-externalClusters:
+    {{- if eq (include "cluster.useBarmanCloudPlugin" .) "false" }}
   - name: objectStoreRecoveryCluster
     barmanObjectStore:
       serverName: {{ .Values.recovery.clusterName }}
       {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.recovery "secretPrefix" "recovery" -}}
       {{- include "cluster.barmanObjectStoreConfig" $d | nindent 4 }}
-  {{- else }}
-externalClusters: []
+    {{- else }}
+  - name: origin
+    plugin:
+      name: barman-cloud.cloudnative-pg.io
+      parameters:
+        barmanObjectName: {{ include "cluster.fullname" $  }}-object-store
+        serverName: {{ .Values.recovery.clusterName |  default (include "cluster.fullname" .) }}
+    {{- end }}
+  {{- else }} []
   {{- end }}
 {{- else if eq .Values.mode "replica" }}
-externalClusters:
   - name: originCluster
   {{- if not (empty .Values.replica.origin.objectStore.provider) }}
     barmanObjectStore:

charts/cluster/values.schema.json

@@ -770,6 +770,23 @@
                                 "destinationPath": {
                                     "type": "string"
                                 },
+                                "endpointCA": {
+                                    "type": "object",
+                                    "properties": {
+                                        "create": {
+                                            "type": "boolean"
+                                        },
+                                        "key": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "value": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
                                 "google": {
                                     "type": "object",
                                     "properties": {

charts/cluster/values.yaml

@@ -561,8 +561,7 @@ replica:
         key: ""
       passwordSecret:
         name: ""
-        key: ""
-
+    key: ""
 ##
 # Database management configuration
 databases: []