Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for block volumes #6897

Merged

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
Contributor

need dco

@kaovilai
Copy link
Contributor

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

@kaovilai
Copy link
Contributor

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

(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
@dzaninovic
Copy link
Contributor Author

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

@shubham-pampattiwar
Copy link
Collaborator

/lgtm

@sseago sseago merged commit c415fd4 into vmware-tanzu:release-1.12 Sep 29, 2023
22 of 24 checks passed
@dzaninovic dzaninovic deleted the block_volume-1.12 branch September 29, 2023 19:29
sseago pushed a commit to openshift/velero that referenced this pull request May 23, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
kaovilai pushed a commit to kaovilai/velero that referenced this pull request Jun 18, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Jun 18, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Jun 18, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Jul 18, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Aug 1, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Aug 22, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
shubham-pampattiwar pushed a commit to shubham-pampattiwar/velero that referenced this pull request Aug 22, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
sseago pushed a commit to sseago/velero that referenced this pull request Sep 19, 2024
(cherry picked from commit 8e01d1b)

Signed-off-by: David Zaninovic <dzaninovic@catalogicsoftware.com>
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