Add `existingResourcePolicy` to Restore API #4628

shubham-pampattiwar · 2022-02-10T07:17:29Z

Thank you for contributing to Velero!

Please add a summary of your change

The PR follows the approach number 1 specified in the ExistingResourcePolicy design and does the following:

adds a new spec to the Velero restore API called existingResourcePolicy
updates the Velero restore CRD with the addition of existingResourcePolicy` spec option
adds the option existing-resource-policy in velero CLI which accepts only none and update as values
updates the logic in velero restore workflow to respect the existingResourcePolicy option when set by the user

Does your change fix a particular issue?

Fixes #4842

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.

eleanor-millman · 2022-03-23T00:39:32Z

@reasonerjt

pkg/cmd/cli/restore/create.go

pkg/restore/restore.go

sseago

In addition to the change to make sure that service accounts get the updated labels, we need to make sure that this is tested for both SAs and other resources, including the "patch only because resource update failed" case. In all cases we need to make sure that we get the right velero labels applied on the first restore attempt (i.e. no prior labels) and that the labels are right on the second restore attempt (i.e. prior labels overwritten)

pkg/restore/restore.go

shubham-pampattiwar · 2022-05-05T05:37:53Z

Can one more maintainer please take a look at this PR ?

eleanor-millman · 2022-05-05T10:45:25Z

cc @reasonerjt

pkg/restore/restore.go

shubham-pampattiwar · 2022-05-09T07:26:29Z

@Lyndon-Li @sseago Updated the PR with respect to feedback, made the changes modular as well as added unit tests, please take another look. Thank you !

codecov-commenter · 2022-05-09T07:32:29Z

Codecov Report

Merging #4628 (e3106f3) into main (db99b6e) will increase coverage by 0.01%.
The diff coverage is 45.13%.

@@            Coverage Diff             @@
##             main    #4628      +/-   ##
==========================================
+ Coverage   41.70%   41.71%   +0.01%     
==========================================
  Files         204      204              
  Lines       18040    18150     +110     
==========================================
+ Hits         7523     7572      +49     
- Misses       9956    10007      +51     
- Partials      561      571      +10

Impacted Files	Coverage Δ
pkg/builder/restore_builder.go	`0.00% <0.00%> (ø)`
pkg/cmd/util/output/restore_describer.go	`0.00% <0.00%> (ø)`
pkg/restore/restore.go	`65.35% <49.51%> (-1.32%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update db99b6e...e3106f3. Read the comment docs.

pkg/restore/restore.go

add updateall policy option fix updating labels dump updateAll policy option remove updateAll policy refs Signed-off-by: Shubham Pampattiwar <[email protected]> add changelog file Signed-off-by: Shubham Pampattiwar <[email protected]> update docs Signed-off-by: Shubham Pampattiwar <[email protected]> patch labels for sa if policy is update Signed-off-by: Shubham Pampattiwar <[email protected]> fix existingResourcePolicy for serviceaccounts modularize changes and add unit tests Signed-off-by: Shubham Pampattiwar <[email protected]> fix conflicts and update crds.go Signed-off-by: Shubham Pampattiwar <[email protected]> change log level from info to error Signed-off-by: Shubham Pampattiwar <[email protected]> update crds.go Signed-off-by: Shubham Pampattiwar <[email protected]>

shubham-pampattiwar · 2022-05-09T17:37:13Z

@Lyndon-Li updated the log levels.

Shubham Pampattiwar has made several contributions to Velero, most recently in designing and implementing two v1.9 features, including the following: - [Add design for enabling multiple label support[(vmware-tanzu#4619) - [Add multiple label selector support to Velero Backup and Restore APIs](vmware-tanzu#4650) - [Add design for enabling support for ExistingResourcePolicy to restore API](vmware-tanzu#4613) - [Add existingResourcePolicy to Restore API](vmware-tanzu#4628) Signed-off-by: Scott Seago <[email protected]>

Shubham Pampattiwar has made several contributions to Velero, most recently in designing and implementing two v1.9 features, including the following: - [Add design for enabling multiple label support](vmware-tanzu#4619) - [Add multiple label selector support to Velero Backup and Restore APIs](vmware-tanzu#4650) - [Add design for enabling support for ExistingResourcePolicy to restore API](vmware-tanzu#4613) - [Add existingResourcePolicy to Restore API](vmware-tanzu#4628) Signed-off-by: Scott Seago <[email protected]>

Shubham Pampattiwar has made several contributions to Velero, most recently in designing and implementing two v1.9 features, including the following: - [Add design for enabling multiple label support](vmware-tanzu#4619) - [Add multiple label selector support to Velero Backup and Restore APIs](vmware-tanzu#4650) - [Add design for enabling support for ExistingResourcePolicy to restore API](vmware-tanzu#4613) - [Add existingResourcePolicy to Restore API](vmware-tanzu#4628) Shubham has also been driving forward the data mover requirements and design discussions for velero 1.10: - [Add datamover design](vmware-tanzu#4768) Signed-off-by: Scott Seago <[email protected]>

shubham-pampattiwar force-pushed the add-restore-policy branch 3 times, most recently from f52cc6f to 3231f7c Compare March 17, 2022 06:45

github-actions bot added the has-changelog label Mar 17, 2022

shubham-pampattiwar marked this pull request as ready for review March 17, 2022 06:52

github-actions bot assigned shubham-pampattiwar Mar 17, 2022

github-actions bot requested review from dsu-igeek and sseago March 17, 2022 06:52

shubham-pampattiwar force-pushed the add-restore-policy branch from 3231f7c to fa5b7a0 Compare March 17, 2022 07:04

github-actions bot added the Documentation label Mar 17, 2022

eleanor-millman removed the request for review from dsu-igeek March 23, 2022 00:39

reasonerjt requested a review from Lyndon-Li March 23, 2022 00:42

sseago requested changes Mar 24, 2022

View reviewed changes

pkg/cmd/cli/restore/create.go Outdated Show resolved Hide resolved

pkg/restore/restore.go Outdated Show resolved Hide resolved

shubham-pampattiwar force-pushed the add-restore-policy branch from fa5b7a0 to e98fb4b Compare March 28, 2022 18:55

shubham-pampattiwar requested a review from sseago March 28, 2022 18:56

sseago requested changes Mar 29, 2022

View reviewed changes

pkg/restore/restore.go Outdated Show resolved Hide resolved

shubham-pampattiwar mentioned this pull request Apr 25, 2022

Capability to overwrite existing Kubernetes objects #4851

Closed

shubham-pampattiwar force-pushed the add-restore-policy branch from e98fb4b to 8f3f795 Compare April 27, 2022 18:14

shubham-pampattiwar requested a review from sseago April 27, 2022 18:15

sseago previously approved these changes Apr 28, 2022

View reviewed changes

reasonerjt mentioned this pull request May 6, 2022

Add ExistingResourcePolicy support to restore API #4842

Closed

Lyndon-Li reviewed May 6, 2022

View reviewed changes

pkg/restore/restore.go Show resolved Hide resolved

pkg/restore/restore.go Show resolved Hide resolved

pkg/restore/restore.go Outdated Show resolved Hide resolved

shubham-pampattiwar dismissed sseago’s stale review via 1581d97 May 9, 2022 07:17

shubham-pampattiwar force-pushed the add-restore-policy branch from 8f3f795 to 1581d97 Compare May 9, 2022 07:17

github-actions bot added the has-unit-tests label May 9, 2022

shubham-pampattiwar force-pushed the add-restore-policy branch 2 times, most recently from 961f64d to dde5f9b Compare May 9, 2022 07:23

shubham-pampattiwar requested review from Lyndon-Li and sseago May 9, 2022 07:26

Lyndon-Li reviewed May 9, 2022

View reviewed changes

shubham-pampattiwar force-pushed the add-restore-policy branch 2 times, most recently from 4b10666 to dcfe39d Compare May 9, 2022 17:34

shubham-pampattiwar force-pushed the add-restore-policy branch from dcfe39d to e3106f3 Compare May 9, 2022 17:36

shubham-pampattiwar requested a review from Lyndon-Li May 9, 2022 17:37

Lyndon-Li approved these changes May 10, 2022

View reviewed changes

sseago approved these changes May 10, 2022

View reviewed changes

reasonerjt approved these changes May 10, 2022

View reviewed changes

reasonerjt merged commit e51865e into vmware-tanzu:main May 10, 2022

a-mccarthy mentioned this pull request May 20, 2022

Update docs to include new --existing-resource-policy flag #4929

Closed

phantasm66 mentioned this pull request Aug 10, 2022

Sync to 2.31.0 upstream chart repo & add missing volume snapshot resource and CRDs (SC-3707) ezcater/velero-helm#2

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add `existingResourcePolicy` to Restore API #4628

Add `existingResourcePolicy` to Restore API #4628

Uh oh!

shubham-pampattiwar commented Feb 10, 2022 •

edited

Loading

Uh oh!

eleanor-millman commented Mar 23, 2022

Uh oh!

Uh oh!

Uh oh!

sseago left a comment

Uh oh!

Uh oh!

shubham-pampattiwar commented May 5, 2022

Uh oh!

eleanor-millman commented May 5, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shubham-pampattiwar commented May 9, 2022

Uh oh!

codecov-commenter commented May 9, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shubham-pampattiwar commented May 9, 2022

Uh oh!

Uh oh!

Add existingResourcePolicy to Restore API #4628

Add existingResourcePolicy to Restore API #4628

Uh oh!

Conversation

shubham-pampattiwar commented Feb 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Please add a summary of your change

Does your change fix a particular issue?

Please indicate you've done the following:

Uh oh!

eleanor-millman commented Mar 23, 2022

Uh oh!

Uh oh!

Uh oh!

sseago left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shubham-pampattiwar commented May 5, 2022

Uh oh!

eleanor-millman commented May 5, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shubham-pampattiwar commented May 9, 2022

Uh oh!

codecov-commenter commented May 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shubham-pampattiwar commented May 9, 2022

Uh oh!

Uh oh!

Add `existingResourcePolicy` to Restore API #4628

Add `existingResourcePolicy` to Restore API #4628

shubham-pampattiwar commented Feb 10, 2022 •

edited

Loading

codecov-commenter commented May 9, 2022 •

edited

Loading