Skip to content

Commit abcf711

Browse files
committed
update all to pg18 and add data_checksum as default to initdb
1 parent 1d25f8d commit abcf711

File tree

8 files changed

+9
-8
lines changed

8 files changed

+9
-8
lines changed

charts/postgres-cluster/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# my-annotation: value
1313

1414
cluster:
15-
dockerImage: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1
15+
dockerImage: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-18.0-1
1616
numberOfInstances: 2
1717

1818
postgresql:

charts/postgres-operator/crds/operatorconfigurations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ spec:
170170
default: "13"
171171
target_major_version:
172172
type: string
173-
default: "17"
173+
default: "18"
174174
kubernetes:
175175
type: object
176176
properties:

charts/postgres-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ configMajorVersionUpgrade:
9191
# minimal Postgres major version that will not automatically be upgraded
9292
minimal_major_version: "13"
9393
# target Postgres major version when upgrading clusters automatically
94-
target_major_version: "17"
94+
target_major_version: "18"
9595

9696
configKubernetes:
9797
# list of additional capabilities for postgres container

manifests/operatorconfiguration.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
default: "13"
169169
target_major_version:
170170
type: string
171-
default: "17"
171+
default: "18"
172172
kubernetes:
173173
type: object
174174
properties:

manifests/postgresql-operator-default-configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ configuration:
4040
# major_version_upgrade_team_allow_list:
4141
# - acid
4242
minimal_major_version: "13"
43-
target_major_version: "17"
43+
target_major_version: "18"
4444
kubernetes:
4545
# additional_pod_capabilities:
4646
# - "SYS_NICE"

pkg/apis/cpo.opensource.cybertec.at/v1/operator_configuration_type.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type MajorVersionUpgradeConfiguration struct {
5050
MajorVersionUpgradeMode string `json:"major_version_upgrade_mode" default:"off"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade
5151
MajorVersionUpgradeTeamAllowList []string `json:"major_version_upgrade_team_allow_list,omitempty"`
5252
MinimalMajorVersion string `json:"minimal_major_version" default:"13"`
53-
TargetMajorVersion string `json:"target_major_version" default:"17"`
53+
TargetMajorVersion string `json:"target_major_version" default:"18"`
5454
}
5555

5656
// KubernetesMetaConfiguration defines k8s conf required for all Postgres clusters and the operator itself

pkg/cluster/k8sres.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,11 @@ func generateSpiloJSONConfiguration(pg *cpov1.PostgresqlParam, patroni *cpov1.Pa
335335
pgVersion, err := strconv.Atoi(pg.PgVersion)
336336
if err != nil {
337337
fmt.Println("Problem to get PGVersion:", err)
338-
pgVersion = 16
338+
pgVersion = 18
339339
}
340340
if pgVersion > 14 {
341341
config.Bootstrap.Initdb = []interface{}{map[string]string{"auth-host": "scram-sha-256"},
342+
"data-checksums",
342343
map[string]string{"auth-local": "trust"},
343344
map[string]string{"encoding": "UTF8"},
344345
map[string]string{"locale": "en_US.UTF-8"},

pkg/controller/operator_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *cpov1.OperatorConfigura
6363
result.MajorVersionUpgradeMode = util.Coalesce(fromCRD.MajorVersionUpgrade.MajorVersionUpgradeMode, "off")
6464
result.MajorVersionUpgradeTeamAllowList = fromCRD.MajorVersionUpgrade.MajorVersionUpgradeTeamAllowList
6565
result.MinimalMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.MinimalMajorVersion, "13")
66-
result.TargetMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.TargetMajorVersion, "17")
66+
result.TargetMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.TargetMajorVersion, "18")
6767

6868
// kubernetes config
6969
result.CustomPodAnnotations = fromCRD.Kubernetes.CustomPodAnnotations

0 commit comments

Comments
 (0)