Skip to content

Commit

Permalink
chore: update postgres zalando schemas (#336)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Farfaday
Farfaday authored Jun 22, 2024
1 parent 9a01184 commit 71373d4
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 30 deletions.
82 changes: 57 additions & 25 deletions acid.zalan.do/operatorconfiguration_v1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"docker_image": {
"type": "string",
"default": "ghcr.io/zalando/spilo-15:3.0-p1"
"default": "ghcr.io/zalando/spilo-16:3.2-p3"
},
"enable_crd_registration": {
"type": "boolean",
Expand Down Expand Up @@ -163,11 +163,11 @@
},
"minimal_major_version": {
"type": "string",
"default": "11"
"default": "12"
},
"target_major_version": {
"type": "string",
"default": "15"
"default": "16"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -220,10 +220,22 @@
"type": "boolean",
"default": false
},
"enable_finalizers": {
"type": "boolean",
"default": false
},
"enable_init_containers": {
"type": "boolean",
"default": true
},
"enable_secrets_deletion": {
"type": "boolean",
"default": true
},
"enable_persistent_volume_claim_deletion": {
"type": "boolean",
"default": true
},
"enable_pod_antiaffinity": {
"type": "boolean",
"default": false
Expand Down Expand Up @@ -321,10 +333,34 @@
"type": "string",
"default": "postgresql-operator"
},
"pdb_master_label_selector": {
"type": "boolean",
"default": true
},
"pdb_name_format": {
"type": "string",
"default": "postgres-{cluster}-pdb"
},
"persistent_volume_claim_retention_policy": {
"type": "object",
"properties": {
"when_deleted": {
"type": "string",
"enum": [
"delete",
"retain"
]
},
"when_scaled": {
"type": "string",
"enum": [
"delete",
"retain"
]
}
},
"additionalProperties": false
},
"pod_antiaffinity_preferred_during_scheduling": {
"type": "boolean",
"default": false
Expand Down Expand Up @@ -422,23 +458,19 @@
"properties": {
"default_cpu_limit": {
"type": "string",
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
"default": "1"
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$"
},
"default_cpu_request": {
"type": "string",
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
"default": "100m"
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$"
},
"default_memory_limit": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$",
"default": "500Mi"
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"default_memory_request": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$",
"default": "100Mi"
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"max_cpu_request": {
"type": "string",
Expand All @@ -450,13 +482,11 @@
},
"min_cpu_limit": {
"type": "string",
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
"default": "250m"
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$"
},
"min_memory_limit": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$",
"default": "250Mi"
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -620,7 +650,7 @@
},
"logical_backup_docker_image": {
"type": "string",
"default": "registry.opensource.zalan.do/acid/logical-backup:v1.10.0"
"default": "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2"
},
"logical_backup_google_application_credentials": {
"type": "string"
Expand Down Expand Up @@ -652,6 +682,9 @@
"logical_backup_s3_bucket": {
"type": "string"
},
"logical_backup_s3_bucket_prefix": {
"type": "string"
},
"logical_backup_s3_endpoint": {
"type": "string"
},
Expand All @@ -671,6 +704,9 @@
"type": "string",
"pattern": "^(\\d+|\\*)(/\\d+)?(\\s+(\\d+|\\*)(/\\d+)?){4}$",
"default": "30 00 * * *"
},
"logical_backup_cronjob_environment_secret": {
"type": "string"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -831,7 +867,7 @@
},
"connection_pooler_image": {
"type": "string",
"default": "registry.opensource.zalan.do/acid/pgbouncer:master-27"
"default": "registry.opensource.zalan.do/acid/pgbouncer:master-32"
},
"connection_pooler_max_db_connections": {
"type": "integer",
Expand All @@ -852,23 +888,19 @@
},
"connection_pooler_default_cpu_limit": {
"type": "string",
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
"default": "1"
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$"
},
"connection_pooler_default_cpu_request": {
"type": "string",
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
"default": "500m"
"pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$"
},
"connection_pooler_default_memory_limit": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$",
"default": "100Mi"
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"connection_pooler_default_memory_request": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$",
"default": "100Mi"
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
}
},
"additionalProperties": false
Expand Down
48 changes: 43 additions & 5 deletions acid.zalan.do/postgresql_v1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,18 @@
"volumeSource"
],
"properties": {
"isSubPathExpr": {
"type": "boolean"
},
"name": {
"type": "string"
},
"mountPath": {
"type": "string"
},
"subPath": {
"type": "string"
},
"targetContainers": {
"type": "array",
"nullable": true,
Expand All @@ -53,9 +59,6 @@
"volumeSource": {
"type": "object",
"x-kubernetes-preserve-unknown-fields": true
},
"subPath": {
"type": "string"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -225,6 +228,9 @@
"x-kubernetes-preserve-unknown-fields": true
}
},
"logicalBackupRetention": {
"type": "string"
},
"logicalBackupSchedule": {
"type": "string",
"pattern": "^(\\d+|\\*)(/\\d+)?(\\s+(\\d+|\\*)(/\\d+)?){4}$"
Expand Down Expand Up @@ -466,12 +472,12 @@
"version": {
"type": "string",
"enum": [
"10",
"11",
"12",
"13",
"14",
"15"
"15",
"16"
]
},
"parameters": {
Expand Down Expand Up @@ -542,6 +548,14 @@
"memory": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"hugepages-2Mi": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"hugepages-1Gi": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
}
},
"additionalProperties": false
Expand All @@ -556,6 +570,14 @@
"memory": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"hugepages-2Mi": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
},
"hugepages-1Gi": {
"type": "string",
"pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -643,6 +665,9 @@
"database": {
"type": "string"
},
"enableRecovery": {
"type": "boolean"
},
"filter": {
"type": "object",
"additionalProperties": {
Expand All @@ -665,6 +690,9 @@
},
"payloadColumn": {
"type": "string"
},
"recoveryEventType": {
"type": "string"
}
},
"additionalProperties": false
Expand Down Expand Up @@ -778,6 +806,13 @@
}
}
},
"usersIgnoringSecretRotation": {
"type": "array",
"nullable": true,
"items": {
"type": "string"
}
},
"usersWithInPlaceSecretRotation": {
"type": "array",
"nullable": true,
Expand All @@ -798,6 +833,9 @@
"size"
],
"properties": {
"isSubPathExpr": {
"type": "boolean"
},
"iops": {
"type": "integer"
},
Expand Down

0 comments on commit 71373d4

Please sign in to comment.