From 932e19aa3299818b4585aa03dafd686d67e9a91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Blondel?= Date: Wed, 8 Jan 2025 07:20:12 +0100 Subject: [PATCH] chore: update postgres zalando schemas (#446) --- acid.zalan.do/operatorconfiguration_v1.json | 22 ++++++++++----------- acid.zalan.do/postgresql_v1.json | 15 ++++++++++++-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/acid.zalan.do/operatorconfiguration_v1.json b/acid.zalan.do/operatorconfiguration_v1.json index 0820c286..d61ce517 100644 --- a/acid.zalan.do/operatorconfiguration_v1.json +++ b/acid.zalan.do/operatorconfiguration_v1.json @@ -30,7 +30,7 @@ }, "docker_image": { "type": "string", - "default": "ghcr.io/zalando/spilo-16:3.3-p1" + "default": "ghcr.io/zalando/spilo-17:4.0-p2" }, "enable_crd_registration": { "type": "boolean", @@ -163,11 +163,11 @@ }, "minimal_major_version": { "type": "string", - "default": "12" + "default": "13" }, "target_major_version": { "type": "string", - "default": "16" + "default": "17" } }, "additionalProperties": false @@ -462,35 +462,35 @@ "properties": { "default_cpu_limit": { "type": "string", - "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$" + "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$|^$" }, "default_cpu_request": { "type": "string", - "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$" + "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$|^$" }, "default_memory_limit": { "type": "string", - "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$" + "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?)$" + "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$|^$" }, "max_cpu_request": { "type": "string", - "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$" + "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$|^$" }, "max_memory_request": { "type": "string", - "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$" + "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$|^$" }, "min_cpu_limit": { "type": "string", - "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$" + "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$|^$" }, "min_memory_limit": { "type": "string", - "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$" + "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$|^$" } }, "additionalProperties": false diff --git a/acid.zalan.do/postgresql_v1.json b/acid.zalan.do/postgresql_v1.json index c002c1ed..2a74ddac 100644 --- a/acid.zalan.do/postgresql_v1.json +++ b/acid.zalan.do/postgresql_v1.json @@ -472,11 +472,11 @@ "version": { "type": "string", "enum": [ - "12", "13", "14", "15", - "16" + "16", + "17" ] }, "parameters": { @@ -661,6 +661,10 @@ "batchSize": { "type": "integer" }, + "cpu": { + "type": "string", + "pattern": "^(\\d+m|\\d+(\\.\\d{1,3})?)$" + }, "database": { "type": "string" }, @@ -673,6 +677,10 @@ "type": "string" } }, + "memory": { + "type": "string", + "pattern": "^(\\d+(e\\d+)?|\\d+(\\.\\d+)?(e\\d+)?[EPTGMK]i?)$" + }, "tables": { "type": "object", "additionalProperties": { @@ -687,6 +695,9 @@ "idColumn": { "type": "string" }, + "ignoreRecovery": { + "type": "boolean" + }, "payloadColumn": { "type": "string" },