Skip to content

Backport PR #9693 and #9700 to Release-1.17#9730

Merged
kaovilai merged 6 commits intovelero-io:release-1.17from
priyansh17:user/priyansh/backport-9693-1.17
Apr 23, 2026
Merged

Backport PR #9693 and #9700 to Release-1.17#9730
kaovilai merged 6 commits intovelero-io:release-1.17from
priyansh17:user/priyansh/backport-9693-1.17

Conversation

@priyansh17
Copy link
Copy Markdown
Collaborator

Thank you for contributing to Velero!

Please add a summary of your change

This is backporting of PRs #9693 and #9700 in main branch to release-1.16.

Please indicate you've done the following:

@github-actions github-actions Bot added Dependencies Pull requests that update a dependency file has-unit-tests has-changelog has-e2e-2tests labels Apr 16, 2026
@github-actions github-actions Bot requested review from Lyndon-Li and ywk253100 April 16, 2026 07:19
@priyansh17 priyansh17 changed the base branch from main to release-1.17 April 16, 2026 07:20
…elero-io#9693)

* Enhance backup deletion logic to handle tarball download failures and clean up associated CSI VolumeSnapshotContents
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* added changelog
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* Refactor error handling in backup deletion
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* Refactor backup deletion logic to skip CSI snapshot cleanup on tarball download failure
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* prevent backup deletion when errors occur
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* added logger
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
…ion (velero-io#9700)

* Add delay to avoid race conditions during VolumeSnapshotContent deletion
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* updated changelog
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* Updated Changelog
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
@priyansh17 priyansh17 force-pushed the user/priyansh/backport-9693-1.17 branch from e5b68c9 to 11c89cf Compare April 16, 2026 07:23
…umesByPod

Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
@kaovilai
Copy link
Copy Markdown
Collaborator

kaovilai commented Apr 16, 2026

ci failing from kubernetes-sigs/kubebuilder#4082 need similar change to main/release-1.18 maybe separate PR? then rebase this

@blackpiglet
Copy link
Copy Markdown
Contributor

Please refer to this PR #9665.

The tag used to latest. Due to latest tag v0.23.3 already used
Golang v1.26, Velero main still uses v1.25. Build failed.
To fix this, pin the controller-runtime to v0.23.2

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
@priyansh17 priyansh17 force-pushed the user/priyansh/backport-9693-1.17 branch from c941b43 to 5d59b54 Compare April 21, 2026 08:17
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 21, 2026

Codecov Report

❌ Patch coverage is 86.66667% with 2 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
pkg/controller/backup_deletion_controller.go 85.71% 1 Missing and 1 partial ⚠️

📢 Thoughts on this report? Let us know!

@priyansh17
Copy link
Copy Markdown
Collaborator Author

@kaovilai / @blackpiglet Thanks, fixed this.

@priyansh17
Copy link
Copy Markdown
Collaborator Author

Please merge this @kaovilai / @blackpiglet

@kaovilai kaovilai merged commit 4f51618 into velero-io:release-1.17 Apr 23, 2026
98 of 99 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Dependencies Pull requests that update a dependency file has-changelog has-e2e-2tests has-unit-tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants