feat(majorupgrade): auto-cleanup failed upgrade job on image rollback#10104
Merged
feat(majorupgrade): auto-cleanup failed upgrade job on image rollback#10104
Conversation
cnpg-bot
added
backport-requested ◀️
Contributor
|
❗ By default, the pull request is configured to backport to all release branches.
|
mnencia
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
from
7163f55 to
a91e27c
Compare
Member
Author
|
/test |
Contributor
|
@mnencia, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22597783147 |
mnencia
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
3 times, most recently
from
fce1be5 to
2d29c47
Compare
Member
Author
|
/test ft=postgres-major-upgrade |
Contributor
|
@mnencia, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22619106064 |
Member
Author
|
/test |
mnencia
requested review from
a team,
NiccoloFei,
jsilvela and
litaocdl
as code owners
dosubot
bot
added
the
size:L
Contributor
|
@mnencia, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22619835859 |
NiccoloFei
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
3 times, most recently
from
97882f5 to
ba49825
Compare
Collaborator
|
/test ft=postgres-major-upgrade |
Contributor
|
@NiccoloFei, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22762269483 |
Collaborator
|
/test |
Contributor
|
@NiccoloFei, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22764323799 |
NiccoloFei
approved these changes
Mar 6, 2026
armru
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
2 times, most recently
from
d94d0d3 to
69879b5
Compare
armru
approved these changes
Mar 6, 2026
armru
approved these changes
Mar 6, 2026
armru
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
2 times, most recently
from
27df5ec to
3b7d9ff
Compare
Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade (retries won't produce a different result and the retry pods hold the primary PVC, blocking recovery). When the upgrade job exists but has not completed, the reconciler now checks whether the user rolled back the image to the previous major version. If so it deletes the job with foreground propagation and requeues, allowing the cluster to restart on the original version without manual intervention. Move the majorupgrade.Reconcile call above the running-jobs guard in reconcileResources so the reconciler can act on failed upgrade jobs that would otherwise block the controller indefinitely. Inspired by Maxim Ivanov's initial rollback approach in #9344. Signed-off-by: Marco Nenciarini <[email protected]>
Add a rollback scenario to the major upgrade E2E suite. The test creates a cluster with the pgvector extension, attempts an upgrade to a minimal image that lacks the extension (causing pg_upgrade to fail), then reverts the image and verifies the operator automatically cleans up the failed job and the cluster recovers on the original version with its timeline unchanged. Based on Niccolò Fei's E2E test work in #9344. Co-authored-by: Niccolò Fei <[email protected]> Signed-off-by: Marco Nenciarini <[email protected]>
Reflect that the operator now automatically detects an image rollback and deletes the failed upgrade job. Users only need to revert the image — manual job deletion is no longer required. Signed-off-by: Marco Nenciarini <[email protected]>
Signed-off-by: Armando Ruocco <[email protected]>
mnencia
force-pushed
the
fix/major-upgrade-rollback-cleanup
branch
from
3b7d9ff to
aafd3dc
Compare
gbartolini
approved these changes
Mar 9, 2026
mnencia
added a commit
that referenced
this pull request
Mar 9, 2026
…#10104) Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade. When the user reverts the image after a failed upgrade, the operator automatically deletes the failed job and lets the cluster restart on the original version. Inspired by Maxim Ivanov's initial rollback approach in #9344. Closes #9128 Signed-off-by: Marco Nenciarini <[email protected]> Signed-off-by: Armando Ruocco <[email protected]> Co-authored-by: Niccolò Fei <[email protected]> Co-authored-by: Armando Ruocco <[email protected]> (cherry picked from commit 5b7b799)
mnencia
added a commit
that referenced
this pull request
Mar 9, 2026
…#10104) Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade. When the user reverts the image after a failed upgrade, the operator automatically deletes the failed job and lets the cluster restart on the original version. Inspired by Maxim Ivanov's initial rollback approach in #9344. Closes #9128 Signed-off-by: Marco Nenciarini <[email protected]> Signed-off-by: Armando Ruocco <[email protected]> Co-authored-by: Niccolò Fei <[email protected]> Co-authored-by: Armando Ruocco <[email protected]> (cherry picked from commit 5b7b799)
mnencia
added a commit
that referenced
this pull request
Mar 9, 2026
…#10104) Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade. When the user reverts the image after a failed upgrade, the operator automatically deletes the failed job and lets the cluster restart on the original version. Inspired by Maxim Ivanov's initial rollback approach in #9344. Closes #9128 Signed-off-by: Marco Nenciarini <[email protected]> Signed-off-by: Armando Ruocco <[email protected]> Co-authored-by: Niccolò Fei <[email protected]> Co-authored-by: Armando Ruocco <[email protected]> (cherry picked from commit 5b7b799)
mnencia
added a commit
that referenced
this pull request
Mar 9, 2026
…#10104) Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade. When the user reverts the image after a failed upgrade, the operator automatically deletes the failed job and lets the cluster restart on the original version. Inspired by Maxim Ivanov's initial rollback approach in #9344. Closes #9128 Signed-off-by: Marco Nenciarini <[email protected]> Signed-off-by: Armando Ruocco <[email protected]> Co-authored-by: Niccolò Fei <[email protected]> Co-authored-by: Armando Ruocco <[email protected]> (cherry picked from commit 5b7b799)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Set BackoffLimit=0 on the major upgrade job so Kubernetes does not retry a failed pg_upgrade. When the user reverts the image after a failed upgrade, the operator automatically deletes the failed job and lets the cluster restart on the original version.
Inspired by Maxim Ivanov's initial rollback approach in #9344.
Closes #9128