Skip to content

[Backport release-1.5] fix(postgres-operator): align CNPG operator and CRDs to 1.28.2 for PVC resize-deadlock fix - #3884

Closed
github-actions[bot] wants to merge 1 commit into
release-1.5from
backport-3510-to-release-1.5
Closed

[Backport release-1.5] fix(postgres-operator): align CNPG operator and CRDs to 1.28.2 for PVC resize-deadlock fix#3884
github-actions[bot] wants to merge 1 commit into
release-1.5from
backport-3510-to-release-1.5

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #3510 to release-1.5.

@github-actions

Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-3510-to-release-1.5
git worktree add --checkout .worktree/backport-3510-to-release-1.5 backport-3510-to-release-1.5
cd .worktree/backport-3510-to-release-1.5
git reset --hard HEAD^
git cherry-pick -x bcb36262efa9f32e472d063871cf1e8af17f88e9
git push --force-with-lease

@myasnikovdaniil

Copy link
Copy Markdown
Contributor

Closing this one, it does not deliver the fix it claims.

The CRD file applied without conflict but the result matches no released cnpg version. It is 17935 lines where release-1.5 has 17681 and real 1.28.2 on main has 18700. All ten CRDs got restamped controller-gen.kubebuilder.io/version: v0.20.1, which is the 1.28.2 stamp, so the version assertion this PR adds passes while the schemas are still missing the whole 1.27.3 to 1.28.1 delta. Green test, wrong CRDs.

Resolving values.yaml to the incoming side finishes it off, because that drops the image.tag: "1.27.3" pin #3526 put here. Then deployment.yaml falls back to .Chart.AppVersion, which is now 1.28.2, so you get operator 1.28.2 against hybrid CRDs. That is exactly the #3479 failure mode the original PR says it was built to avoid.

Also the original scopes its own backport to release-1.6 on the same 0.27.1 base chart. release-1.5 is on 0.26.1, and the incoming patches/cloudnative-pg-1.28.2.patch is written against 0.27.1, so make update would not work either.

The resize deadlock is real on this branch, so if we want it in 1.5.x it is a deliberate re-vendor PR (pull 0.27.1, apply the 1.28.2 patch, drop the pin, delete the 1.27.3 patch) with its own review and a live upgrade test.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant