Skip to content

Commit 85b8058

Browse files
authored
bump spilo to 16-3.3, drop support for pg11 (#2706)
* bump spilo to 16-3.3, drop support for pg11 * update README
1 parent e6ae9e3 commit 85b8058

14 files changed

+10
-16
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as
2828

2929
### PostgreSQL features
3030

31-
* Supports PostgreSQL 16, starting from 11+
31+
* Supports PostgreSQL 16, starting from 12+
3232
* Streaming replication cluster via Patroni
3333
* Point-In-Time-Recovery with
3434
[pg_basebackup](https://www.postgresql.org/docs/16/app-pgbasebackup.html) /

charts/postgres-operator/crds/operatorconfigurations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
type: string
6969
docker_image:
7070
type: string
71-
default: "ghcr.io/zalando/spilo-16:3.2-p3"
71+
default: "ghcr.io/zalando/spilo-16:3.3-p1"
7272
enable_crd_registration:
7373
type: boolean
7474
default: true

charts/postgres-operator/crds/postgresqls.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ spec:
375375
version:
376376
type: string
377377
enum:
378-
- "11"
379378
- "12"
380379
- "13"
381380
- "14"

charts/postgres-operator/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ configGeneral:
3838
# etcd connection string for Patroni. Empty uses K8s-native DCS.
3939
etcd_host: ""
4040
# Spilo docker image
41-
docker_image: ghcr.io/zalando/spilo-16:3.2-p3
41+
docker_image: ghcr.io/zalando/spilo-16:3.3-p1
4242

4343
# key name for annotation to ignore globally configured instance limits
4444
# ignore_instance_limits_annotation_key: ""

manifests/complete-postgres-manifest.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
# "delete-date": "2020-08-31" # can only be deleted on that day if "delete-date "key is configured
1111
# "delete-clustername": "acid-test-cluster" # can only be deleted when name matches if "delete-clustername" key is configured
1212
spec:
13-
dockerImage: ghcr.io/zalando/spilo-16:3.2-p3
13+
dockerImage: ghcr.io/zalando/spilo-16:3.3-p1
1414
teamId: "acid"
1515
numberOfInstances: 2
1616
users: # Application/Robot users

manifests/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data:
3434
default_memory_request: 100Mi
3535
# delete_annotation_date_key: delete-date
3636
# delete_annotation_name_key: delete-clustername
37-
docker_image: ghcr.io/zalando/spilo-16:3.2-p3
37+
docker_image: ghcr.io/zalando/spilo-16:3.3-p1
3838
# downscaler_annotations: "deployment-time,downscaler/*"
3939
# enable_admin_role_for_users: "true"
4040
# enable_crd_registration: "true"

manifests/operatorconfiguration.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
type: string
6767
docker_image:
6868
type: string
69-
default: "ghcr.io/zalando/spilo-16:3.2-p3"
69+
default: "ghcr.io/zalando/spilo-16:3.3-p1"
7070
enable_crd_registration:
7171
type: boolean
7272
default: true

manifests/postgresql-operator-default-configuration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: OperatorConfiguration
33
metadata:
44
name: postgresql-operator-default-configuration
55
configuration:
6-
docker_image: ghcr.io/zalando/spilo-16:3.2-p3
6+
docker_image: ghcr.io/zalando/spilo-16:3.3-p1
77
# enable_crd_registration: true
88
# crd_categories:
99
# - all

manifests/postgresql.crd.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ spec:
373373
version:
374374
type: string
375375
enum:
376-
- "11"
377376
- "12"
378377
- "13"
379378
- "14"

pkg/apis/acid.zalan.do/v1/crds.go

-3
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
595595
"version": {
596596
Type: "string",
597597
Enum: []apiextv1.JSON{
598-
{
599-
Raw: []byte(`"11"`),
600-
},
601598
{
602599
Raw: []byte(`"12"`),
603600
},

pkg/cluster/majorversionupgrade.go

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
// VersionMap Map of version numbers
1313
var VersionMap = map[string]int{
14-
"11": 110000,
1514
"12": 120000,
1615
"13": 130000,
1716
"14": 140000,

pkg/controller/operator_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
3939
result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix
4040
result.EtcdHost = fromCRD.EtcdHost
4141
result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps
42-
result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.2-p3")
42+
result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.3-p1")
4343
result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8)
4444
result.MinInstances = fromCRD.MinInstances
4545
result.MaxInstances = fromCRD.MaxInstances

pkg/util/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ type Config struct {
174174
WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
175175
KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"`
176176
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
177-
DockerImage string `name:"docker_image" default:"ghcr.io/zalando/spilo-16:3.2-p3"`
177+
DockerImage string `name:"docker_image" default:"ghcr.io/zalando/spilo-16:3.3-p1"`
178178
SidecarImages map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
179179
SidecarContainers []v1.Container `name:"sidecars"`
180180
PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"`

ui/operator_ui/spiloutils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def read_versions(
305305
if uid == 'wal' or defaulting(lambda: UUID(uid))
306306
]
307307

308-
BACKUP_VERSION_PREFIXES = ['', '9.6/', '10/', '11/', '12/', '13/', '14/', '15/', '16/']
308+
BACKUP_VERSION_PREFIXES = ['', '10/', '11/', '12/', '13/', '14/', '15/', '16/']
309309

310310
def read_basebackups(
311311
pg_cluster,

0 commit comments

Comments
 (0)