public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test on spilo new image with patroni v4

This commit is contained in:
idanovinda 2024-11-19 14:29:29 +01:00
parent c206eb38a8
commit ce67ee1bca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/configmap.yaml
View File

@ -34,7 +34,7 @@ data:
default_memory_request: 100Mi default_memory_request: 100Mi
# delete_annotation_date_key: delete-date # delete_annotation_date_key: delete-date
# delete_annotation_name_key: delete-clustername # delete_annotation_name_key: delete-clustername
docker_image: ghcr.io/zalando/spilo-16:3.3-p1 docker_image: container-registry-test.zalando.net/acid/spilo-cdp-pr1050-16:4.0-p4
# downscaler_annotations: "deployment-time,downscaler/*" # downscaler_annotations: "deployment-time,downscaler/*"
enable_admin_role_for_users: "true" enable_admin_role_for_users: "true"
enable_crd_registration: "true" enable_crd_registration: "true"
@ -134,6 +134,8 @@ data:
pod_management_policy: "ordered_ready" pod_management_policy: "ordered_ready"
# pod_priority_class_name: "postgres-pod-priority" # pod_priority_class_name: "postgres-pod-priority"
pod_role_label: spilo-role pod_role_label: spilo-role
pod_leader_label_value: master
pod_standby_leader_label_value: standby_leader
pod_service_account_definition: "" pod_service_account_definition: ""
pod_service_account_name: "postgres-pod" pod_service_account_name: "postgres-pod"
pod_service_account_role_binding_definition: "" pod_service_account_role_binding_definition: ""

2
pkg/cluster/majorversionupgrade.go
View File

@ -155,7 +155,7 @@ func (c *Cluster) majorVersionUpgrade() error {
c.logger.Infof("identified non running pod, potentially skipping major version upgrade") c.logger.Infof("identified non running pod, potentially skipping major version upgrade")
} }
if ps.Role == "master" { if ps.Role == "master" || ps.Role == "primary" {
masterPod = &pods[i] masterPod = &pods[i]
c.currentMajorVersion = ps.ServerVersion c.currentMajorVersion = ps.ServerVersion
} }