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

Retrieve DataUpload into result ConfigMap during volume snapshot restore. #6410

Merged
merged 3 commits into from Jun 30, 2023

Conversation

blackpiglet
Copy link
Contributor

@blackpiglet blackpiglet commented Jun 20, 2023

Fix issue #6117.
Add CSI plugin needs builder functions.

Thank you for contributing to Velero!

Please add a summary of your change

Does your change fix a particular issue?

Fix issue #6117.

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.

@codecov-commenter
Copy link

Codecov Report

Merging #6410 (bdff9f9) into main (6f3adcf) will increase coverage by 2.54%.
The diff coverage is 72.05%.

@@            Coverage Diff             @@
##             main    #6410      +/-   ##
==========================================
+ Coverage   51.31%   53.86%   +2.54%     
==========================================
  Files         228      229       +1     
  Lines       23777    23843      +66     
==========================================
+ Hits        12202    12842     +640     
+ Misses      10668    10051     -617     
- Partials      907      950      +43     
Impacted Files Coverage Δ
pkg/cmd/server/server.go 20.87% <ø> (ø)
pkg/restore/dataupload_retrieve_action.go 71.42% <71.42%> (ø)
pkg/restore/restore.go 64.60% <75.00%> (+0.03%) ⬆️

... and 13 files with indirect coverage changes

@blackpiglet blackpiglet changed the title Retrieve DataUpload into backup result ConfigMap during volume snapshot restore. Retrieve DataUpload into result ConfigMap during volume snapshot restore. Jun 22, 2023
@blackpiglet blackpiglet force-pushed the 6117_fix branch 3 times, most recently from 51e6397 to 79e7194 Compare June 22, 2023 16:17
@blackpiglet blackpiglet marked this pull request as ready for review June 22, 2023 16:31
Lyndon-Li
Lyndon-Li previously approved these changes Jun 23, 2023
Lyndon-Li
Lyndon-Li previously approved these changes Jun 27, 2023
Lyndon-Li
Lyndon-Li previously approved these changes Jun 28, 2023
@blackpiglet blackpiglet requested a review from sseago June 28, 2023 07:28
@blackpiglet
Copy link
Contributor Author

@sseago
@shubham-pampattiwar
Could you help to take a look?

Copy link
Collaborator

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One NIT, else LGTM! But I beleieve you need to rebase the PR due to conflicts.

pkg/apis/velero/v1/labels_annotations.go Outdated Show resolved Hide resolved
pkg/cmd/server/server.go Show resolved Hide resolved
…ot restore.

Fix issue vmware-tanzu#6117.
Add CSI plugin needs builder functions.

Signed-off-by: Xun Jiang <jxun@vmware.com>
blackpiglet and others added 2 commits June 30, 2023 11:15
Signed-off-by: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com>
…ot restore.

Fix issue vmware-tanzu#6117.
Add CSI plugin needs builder functions.

Signed-off-by: Xun Jiang <jxun@vmware.com>
@blackpiglet blackpiglet merged commit 84eca51 into vmware-tanzu:main Jun 30, 2023
22 checks passed
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.

None yet

5 participants