Skip to content

Conversation

@dzaninovic
Copy link
Contributor

Thank you for contributing to Velero!

Please add a summary of your change

Cherry-pick #6680 to 1.12 release.

Does your change fix a particular issue?

Fixes #6548

Please indicate you've done the following:

  • Accepted the DCO. Commits without the DCO will delay acceptance.
  • Created a changelog file or added /kind changelog-not-required as a comment on this pull request.
  • Updated the corresponding documentation in site/content/docs/main.

Testing

I ran automated tests and retested backup and restore of block and filesystem PVC with md5 verification.

@dzaninovic dzaninovic mentioned this pull request Sep 28, 2023
3 tasks
sseago
sseago previously approved these changes Sep 28, 2023
@codecov
Copy link

codecov bot commented Sep 28, 2023

Codecov Report

Merging #6897 (feccdec) into release-1.12 (554403d) will decrease coverage by 0.10%.
The diff coverage is 55.00%.

@@               Coverage Diff                @@
##           release-1.12    #6897      +/-   ##
================================================
- Coverage         60.47%   60.37%   -0.10%     
================================================
  Files               244      246       +2     
  Lines             26074    26232     +158     
================================================
+ Hits              15768    15838      +70     
- Misses             9199     9279      +80     
- Partials           1107     1115       +8     
Files Coverage Δ
pkg/datapath/file_system.go 32.14% <100.00%> (-2.03%) ⬇️
pkg/exposer/generic_restore.go 71.31% <100.00%> (-0.12%) ⬇️
pkg/install/daemonset.go 100.00% <100.00%> (ø)
pkg/uploader/provider/kopia.go 83.44% <100.00%> (-0.64%) ⬇️
pkg/exposer/csi_snapshot.go 79.92% <75.00%> (-0.64%) ⬇️
pkg/controller/data_upload_controller.go 68.44% <85.71%> (+0.08%) ⬆️
pkg/install/resources.go 77.20% <0.00%> (-0.94%) ⬇️
pkg/install/deployment.go 91.18% <0.00%> (-1.64%) ⬇️
pkg/exposer/host_path.go 80.00% <45.45%> (+3.80%) ⬆️
pkg/uploader/kopia/snapshot.go 83.33% <81.81%> (+0.88%) ⬆️
... and 5 more

@sseago
Copy link
Collaborator

sseago commented Sep 29, 2023

@dzaninovic Oh, I guess you need to update the changelog filename to reflect the cherry-pick PR number.

@dzaninovic dzaninovic force-pushed the block_volume-1.12 branch 2 times, most recently from 0dcce79 to 3bd6a8a Compare September 29, 2023 17:51
@dzaninovic
Copy link
Contributor Author

@dzaninovic Oh, I guess you need to update the changelog filename to reflect the cherry-pick PR number.

@sseago, I was not sure if that needs to be updated since it is a cherry-pick.
I updated it now.

@sseago
Copy link
Collaborator

sseago commented Sep 29, 2023

@dzaninovic one more thing -- looks like this PR needs to be rebased after recent merges to release-1.12

@dzaninovic
Copy link
Contributor Author

@dzaninovic one more thing -- looks like this PR needs to be rebased after recent merges to release-1.12

@sseago, I rebased it again.

@kaovilai
Copy link
Collaborator

need dco

@kaovilai
Copy link
Collaborator

im assuming it wants signoff as last line in commit message.

@kaovilai
Copy link
Collaborator

Just git commit --signoff --amend --no-edit

(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <[email protected]>
@dzaninovic
Copy link
Contributor Author

I fixed the DCO issue by moving it to the last line.

@shubham-pampattiwar
Copy link
Collaborator

/lgtm

oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Sep 11, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Sep 12, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Sep 12, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Sep 30, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 11, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 16, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 18, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 23, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 25, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 28, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Oct 29, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 1, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 1, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 4, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 6, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 8, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 11, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 13, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 20, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 22, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 25, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 27, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Nov 29, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 4, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 6, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 9, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 11, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 13, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 20, 2025
oadp-rebasebot-cloner bot pushed a commit to oadp-rebasebot/velero that referenced this pull request Dec 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants