patroni slots is not an array but a nested hash map

This commit is contained in:
Felix Kunde 2019-10-24 14:45:44 +02:00
parent abaae95bac
commit 5f19587dda
4 changed files with 32 additions and 32 deletions

View File

@ -162,8 +162,8 @@ spec:
items: items:
type: string type: string
slots: slots:
type: array type: object
items: additionalProperties:
type: object type: object
additionalProperties: additionalProperties:
type: string type: string

View File

@ -13,7 +13,7 @@ spec:
teamId: "ACID" teamId: "ACID"
volume: volume:
size: 1Gi size: 1Gi
# storageClass: my-sc # storageClass: my-sc
numberOfInstances: 2 numberOfInstances: 2
users: # Application/Robot users users: # Application/Robot users
zalando: zalando:
@ -30,7 +30,7 @@ spec:
# Expert section # Expert section
enableShmVolume: true enableShmVolume: true
# spiloFSGroup: 103 spiloFSGroup: 103
postgresql: postgresql:
version: "11" version: "11"
parameters: parameters:
@ -52,13 +52,13 @@ spec:
pg_hba: pg_hba:
- hostssl all all 0.0.0.0/0 md5 - hostssl all all 0.0.0.0/0 md5
- host all all 0.0.0.0/0 md5 - host all all 0.0.0.0/0 md5
# slots: # slots:
# - permanent_physical_1: # permanent_physical_1:
# type: physical # type: physical
# - permanent_logical_1: # permanent_logical_1:
# type: logical # type: logical
# database: foo # database: foo
# plugin: pgoutput # plugin: pgoutput
ttl: 30 ttl: 30
loop_wait: &loop_wait 10 loop_wait: &loop_wait 10
retry_timeout: 10 retry_timeout: 10
@ -66,28 +66,28 @@ spec:
# restore a Postgres DB with point-in-time-recovery # restore a Postgres DB with point-in-time-recovery
# with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp # with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp
# with an empty/absent timestamp, clone from an existing alive cluster using pg_basebackup # with an empty/absent timestamp, clone from an existing alive cluster using pg_basebackup
# clone: # clone:
# uid: "efd12e58-5786-11e8-b5a7-06148230260c" # uid: "efd12e58-5786-11e8-b5a7-06148230260c"
# cluster: "acid-batman" # cluster: "acid-batman"
# timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6) # timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
# s3_wal_path: "s3://custom/path/to/bucket" # s3_wal_path: "s3://custom/path/to/bucket"
# run periodic backups with k8s cron jobs # run periodic backups with k8s cron jobs
# enableLogicalBackup: true # enableLogicalBackup: true
# logicalBackupSchedule: "30 00 * * *" # logicalBackupSchedule: "30 00 * * *"
maintenanceWindows: maintenanceWindows:
- 01:00-06:00 #UTC - 01:00-06:00 #UTC
- Sat:00:00-04:00 - Sat:00:00-04:00
# sidecars: # sidecars:
# - name: "telegraf-sidecar" # - name: "telegraf-sidecar"
# image: "telegraf:latest" # image: "telegraf:latest"
# resources: # resources:
# limits: # limits:
# cpu: 500m # cpu: 500m
# memory: 500Mi # memory: 500Mi
# requests: # requests:
# cpu: 100m # cpu: 100m
# memory: 100Mi # memory: 100Mi
# env: # env:
# - name: "USEFUL_VAR" # - name: "USEFUL_VAR"
# value: "perhaps-true" # value: "perhaps-true"

View File

@ -122,8 +122,8 @@ spec:
items: items:
type: string type: string
slots: slots:
type: array type: object
items: additionalProperties:
type: object type: object
additionalProperties: additionalProperties:
type: string type: string

View File

@ -263,8 +263,8 @@ var postgresCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
}, },
}, },
"slots": { "slots": {
Type: "array", Type: "object",
Items: &apiextv1beta1.JSONSchemaPropsOrArray{ AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
Schema: &apiextv1beta1.JSONSchemaProps{ Schema: &apiextv1beta1.JSONSchemaProps{
Type: "object", Type: "object",
AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{ AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{