diff --git a/docs/public/installation.md b/docs/public/installation.md index 06118867..c84c7564 100644 --- a/docs/public/installation.md +++ b/docs/public/installation.md @@ -399,6 +399,7 @@ This sections describes all possible deploy parameters for PostgreSQL Backup Dae | backupDaemon.evictionPolicy | string | no | `7d/delete` | The eviction policy for full backups: period and action. | | backupDaemon.evictionBinaryPolicy | string | no | `7d/delete` | The eviction policy for granular backups: period and action. | | backupDaemon.archiveEvictionPolicy | string | no | `7d` | The eviction policy for wal files in case of Point In Time Recovery. Can be set as a time interval (min\h\d) or size (MB\GB). The limit is "soft," so the archive can keep files a little longer or take a little more space. | +| backupDaemon.connectTimeout | string | no | "5" | Specifies the PostgreSQL connection timeout in seconds. The value must be a numeric string, for example "5" or "60". If omitted, the default value "5" is used. | | backupDaemon.storage.type | string | yes | n/a | Specifies the storage type. The possible values are `pv` and `provisioned` and `s3`. | | backupDaemon.storage.size | string | yes | n/a | Specifies size of PostgreSQL Backup Daemon PVC. | | backupDaemon.storage.storageClass | string | no | n/a | Specifies storageClass that will be used for PostgreSQL Backup Daemon PVC. Should be specified only in case of `provisioned` storageClass. | diff --git a/operator/charts/patroni-services/values.schema.json b/operator/charts/patroni-services/values.schema.json index 8a398e2e..3e49d4c3 100644 --- a/operator/charts/patroni-services/values.schema.json +++ b/operator/charts/patroni-services/values.schema.json @@ -641,10 +641,64 @@ }, "s3Aliases": { "type": "array", + "default": [], "items": { - "type": "string" - }, - "default": [] + "type": "object", + "additionalProperties": false, + "required": [ + "name", + "spec", + "secretContent" + ], + "properties": { + "name": { + "type": "string" + }, + "spec": { + "type": "object", + "additionalProperties": false, + "required": [ + "storageBucket", + "storageServerUrl", + "storageUsername" + ], + "properties": { + "storageBucket": { + "type": "string" + }, + "storageProvider": { + "type": "string" + }, + "storageRegion": { + "type": "string", + "default": "us-east-1" + }, + "storageServerUrl": { + "type": "string" + }, + "storageUsername": { + "type": "string" + }, + "default": { + "type": "boolean", + "default": false + } + } + }, + "secretContent": { + "type": "object", + "additionalProperties": false, + "required": [ + "storagePassword" + ], + "properties": { + "storagePassword": { + "type": "string" + } + } + } + } + } }, "granularBackupSchedule": { "type": "string" @@ -750,7 +804,7 @@ }, "dbaas": { "type": "object", - "additionalProperties": false, + "additionalProperties": true, "properties": { "install": { "type": "boolean",