[yuminn-k]

Problem description

nodeAffinity() builds the match expressions for node_readiness_label by ranging over the map, so the order changes from one call to the next. With two or more labels the generated affinity often differs from the one in the running statefulset. compareStatefulSetWith compares the two with reflect.DeepEqual, reports "new statefulset's pod affinity does not match the current one" and replaces the statefulset. The pods roll and the master switches over on every sync.

This change sorts the keys before building the match expressions, so the output is the same on every call. The pooler deployment and the logical backup job call the same function, so they get the fix too.

TestNodeAffinityReadinessLabelOrder calls nodeAffinity() 20 times with four readiness labels and checks the keys come out sorted every time. It fails on master and passes with this change.

Linked issues

Fixes #2931

Checklist

Thanks for submitting a pull request to the Postgres Operator project.
Please, ensure your contribution matches the following items:

• Your go code is formatted. Your IDE should do it automatically for you.
• You have updated generated code when introducing new fields to the acid.zalan.do api package.
• New configuration options are reflected in CRD validation, helm charts and sample manifests.
• New functionality is covered by unit and/or e2e tests.
• You have checked existing open PRs for possible overlay and referenced them.

AI disclosure: Written with Claude Code (Claude Opus 5.5)

🤖 Generated with Claude Code