mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-15 19:56:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,502 Commits 74 Branches 185 Tags
1249e699990ebee2cee0b45a09ca4792c77b5843
Commit Graph
176 Commits
Author SHA1 Message Date
Adam Zhang ef100da89b remove VolumeSnapshotContents from resourceMustHave list 
Stop force-including VolumeSnapshotContents via resourceMustHave on
every restore; CSI VolumeSnapshot/PVC RestoreItemActions now set
`restore.velero.io/must-include-additional-items` so bound snapshot
dependencies are restored only when their parent is restored.

Fixes: #9957

Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
 2026-07-28 14:04:15 +08:00
Adam ZhangandGitHub a43a1bce6a Add RIA must-include additional items (#10082) 
Let RestoreItemActions opt in via annotation to
bypass global restore filters for AdditionalItems,
mirroring the backup-side must-include behavior.

Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
 2026-07-27 16:36:55 -04:00
Shubham PampattiwarandGitHub e593ba73f9 Fix PodVolumeBackup metadata loss on fs-backup timeout (#9995)
Run the E2E test on kind / get-go-version (push) Failing after 1m6s
Details
Run the E2E test on kind / build (push) Has been skipped
Details
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
Details
Run the E2E test on kind / run-e2e-test (push) Has been skipped
Details
Main CI / get-go-version (push) Successful in 15s
Details
Main CI / Build (push) Failing after 24s
Details 
* Fix PodVolumeBackup metadata loss on fs-backup timeout

When a backup hits the fs-backup timeout, WaitAllPodVolumesProcessed
returned nil because PVBs were only collected from the indexer in the
done branch of the select. This discarded all PVB metadata including
already-completed PVBs, making their data unrestorable.

Move the PVB collection loop to run after the select so tracked PVBs
are always persisted regardless of timeout.

Fixes #9986

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Add changelog for PR #9995

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Filter non-completed PVBs in hasPodVolumeBackup

After preserving tracked PVBs on timeout, non-completed PVBs (in-progress
or with no snapshot ID) would cause hasPodVolumeBackup to return true,
leading the restore to skip the original PV and dynamically re-provision
it without any data to restore from.

Only match PVBs that are Completed with a valid SnapshotID.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Add unit tests for hasPodVolumeBackup phase filtering

Verify that hasPodVolumeBackup only matches PVBs that are Completed
with a valid SnapshotID, and rejects in-progress, failed, or
empty-snapshot PVBs.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

---------

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
 2026-07-14 12:22:52 -04:00
Adam Zhang f3beea83da address review comments 
- normalized the input to lower case for consistency
- added validations for kind collision
- add flag for unresolved kinds, and defer skip decision base on that
- move peek-and-map test cases to restore_policies_test.go

Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
 2026-07-09 11:50:20 +08:00
Adam Zhang 0d6b5a4f9b add fallback for unresolved kinds via peek-and-map 
When a user specifies a Custom Resource Kind in a restore filter
policy (e.g., kinds: [MyCustomKind]), the discovery helper fails
to resolve it if the CRD hasn't been restored yet.

This adds a peek-and-map fallback: if a resource type in the
backup tarball doesn't match the resolved filters, Velero peeks
at the actual Kind of the first item in the tarball and matches
it against the user's original policy strings.

Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
 2026-07-08 11:18:10 +08:00
Xun Jiang 49b670a791 Replace github.com/pkg/errors by github.com/cockroachdb/errors 
Change errors.Cause to errors.Is, because github.com/cockroachdb/errors
New() function create a error with error stack with depth 1, but
github.com/pkg/errors's New() function create error with no depth.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
 2026-06-10 15:55:57 +08:00
Shubham Pampattiwar c2840f1c74 Fix tests: populate createdName for all created resources 
Update test expectations to include createdName field for resources
with action 'created'. Also ensure namespaces track their created
names when created via EnsureNamespaceExistsAndIsReady.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
 2025-10-27 12:44:31 -07:00
Lyndon-Li 34f8b73507 bump up kopia to v0.21.1 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
 2025-07-22 15:56:04 +08:00
Shubham Pampattiwar a73a150d98 Accommodate VGS workflows in PVC CSI plugin 
Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

Add changelog file

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

make update

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

lint fix

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

add unit tests for getVSForPVC func

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

Use v1beta1 instead of v1 v1alpha1

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

go mod tidy

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

update updateVGSCreatedVS func to use retry on conflict

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

make update minor fix

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

fix ut assert

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

Address PR feedback

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

minor updates

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

remove unsused func and add todo for dep upgrades

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
 2025-07-21 11:36:40 -07:00
Matthieu MOREL 07ea14962c fix require-error rule from testifylint 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-06-23 15:39:54 +00:00
Matthieu MOREL 3024e6223e fix equal-values rule from testifylint 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-06-22 22:41:08 +02:00
Matthieu MOREL 59825a0506 fix len rule from testifylint 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-06-22 22:41:08 +02:00
Wenkai Yin(尹文开)andGitHub e446d92d4c Merge pull request #8464 from shubham-pampattiwar/obj-status-restore-impl
Run the E2E test on kind / build (push) Failing after 5m28s
Details
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
Details
Run the E2E test on kind / run-e2e-test (push) Has been skipped
Details
Main CI / Build (push) Failing after 35s
Details
Close stale issues and PRs / stale (push) Successful in 7s
Details
Trivy Nightly Scan / Trivy nightly scan (velero, main) (push) Failing after 56s
Details
Trivy Nightly Scan / Trivy nightly scan (velero-restore-helper, main) (push) Failing after 50s
Details 
Allowing Object-Level Resource Status Restore
 2025-02-13 13:37:58 +08:00
Shubham Pampattiwar 893621c1ad Allowing Object-Level Resource Status Restore 
Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

add changelog

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

Update impl according to design

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

make update

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

update logging

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
 2025-02-12 18:59:25 -08:00
Matthieu MOREL cbba3bdde7 chore: enable use-any from revive 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-01-17 07:58:10 +01:00
Matthieu MORELandGitHub 29a77958d5 fix: dupword on tests 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-01-10 11:44:06 +01:00
sangitaray2021andGitHub 74790d9f60 Added tracking for deleted namespace status check in restore flow (#8233) 
* Added tracking for deleted namespace status check in restore flow

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

fixed unittest

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

refactored tracker execution and caller

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

added change log

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

Author:    sangitaray2021 <sangitaray@microsft.com>

Author:    sangitaray2021 <sangitaray@microsoft.com>
Date:      Thu Sep 19 02:26:14 2024 +0530
Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

* fixed linter issuer

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

* incorporated PR comments

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

* resolved comments

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>

---------

Signed-off-by: sangitaray2021 <sangitaray@microsoft.com>
 2024-11-18 13:41:07 +05:30
Matthieu MOREL 226a4c1138 golangci-lint: enable and fix thelper linter 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-10-17 08:12:57 +02:00
Daniel JiangandGitHub 7439db57b3 Merge pull request #8166 from ywk253100/240705_plugin_args 
Pass Velero server command args to the plugins
 2024-09-06 14:29:42 +08:00
Wenkai Yin(尹文开) dc6eeafe98 Pass Velero server command args to the plugins 
Pass Velero server command args to the plugins

Fixes #7806

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
 2024-09-04 13:43:27 +08:00
Anshul Ahuja 434bd2f3ae linter 
Signed-off-by: Anshul Ahuja <anshul.ahu@gmail.com>
 2024-09-02 05:08:59 +00:00
Anshul Ahuja 79156bedad Merge branch 'main' into pvnullfix 
Signed-off-by: Anshul Ahuja <anshul.ahu@gmail.com>
 2024-09-02 04:53:53 +00:00
Anshul Ahuja 8be8fc6671 Add check for PV claimref nil 
Signed-off-by: Anshul Ahuja <anshul.ahu@gmail.com>
 2024-09-02 04:50:16 +00:00
Matthieu MORELandGitHub c8baaa9b11 testifylint: enable more rules (#8024) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-07-18 10:43:16 -04:00
Matthieu MORELandGitHub 35c90f1672 testifylint: enable error-nil rule (#7670) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-07-16 12:23:16 -04:00
Matthieu MOREL 1010b04821 testifylint: enable compares rule 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-05-16 20:18:43 +00:00
Xun Jiang 59eeec268b Update CSI document. Remove the CSI plugin verifier. 
Signed-off-by: Xun Jiang <blackpigletbruce@gmail.com>
 2024-04-12 13:51:20 +08:00
Daniel Jiang 0a280e5786 Track and persist restore volume info 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2024-04-11 17:32:18 +08:00
clonefetchandGitHub 474dc824e7 chore: fix function names in comment (#7633) 
Signed-off-by: clonefetch <c0217@outlook.com>
 2024-04-10 15:15:29 +05:30
Matthieu MOREL ef04ef6361 golangci-lint: use exclude-rules instead of skip-files and skip-dirs 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2024-03-27 20:17:34 +00:00
Xun Jiang efb94ae610 Refactor the native snapshot definition code. 
Signed-off-by: Xun Jiang <blackpigletbruce@gmail.com>
 2024-03-20 15:38:07 +08:00
Xun Jiang 4d01c7ffa3 Check whether the VolumeSnapshot's source PVC is nil before using it. 
Signed-off-by: Xun Jiang <blackpigletbruce@gmail.com>
 2024-03-13 11:21:48 +08:00
Wenkai Yin(尹文开) 8752c3a820 Bump up the versions of severel Kubernetes-related libs 
Bump up the versions of severel Kubernetes-related libs

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
 2024-03-05 13:09:38 +08:00
Xun Jiang 9be8eb0c6d Don't generate empty structure. 
VolumeInfo contains several sub-structures. They are filled for
different scenarios. Do not generate empty structure for the
not filled sub-structures.

Signed-off-by: Xun Jiang <jxun@vmware.com>
 2023-12-21 14:53:03 +08:00
Xun Jiang c77bec73bb Move VolumesInformation to an independant package. 
Signed-off-by: Xun Jiang <jxun@vmware.com>
 2023-12-04 08:33:37 +08:00
Xun Jiang ca97248f2a Use VolumeInfo to help restore the PV. 
Add VolumeInfo for left PVs during backup.

Signed-off-by: Xun Jiang <jxun@vmware.com>
 2023-12-04 08:33:37 +08:00
Lyndon-Li efc5319c1c Issue 6693: partially fail restore if CSI snapshot is involved but CSI feature is not ready 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
 2023-11-10 12:40:41 +08:00
Xun Jiang 1fb0529d98 Add DataUpload Result and CSI VolumeSnapshot check for restore PV. 
Signed-off-by: Xun Jiang <jxun@vmware.com>
 2023-11-06 22:40:03 +08:00
Scott Seago 7750e12151 Perf improvements for existing resource restore 
Use informer cache with dynamic client for Get calls on restore
When enabled, also make the Get call before create.

Add server and install parameter to allow disabling this feature,
but enable by default

Signed-off-by: Scott Seago <sseago@redhat.com>
 2023-10-11 10:51:39 -04:00
Xun Jiang ec4bb42117 Retrieve DataUpload into backup result ConfigMap during volume snapshot restore. 
Fix issue #6117.
Add CSI plugin needs builder functions.

Signed-off-by: Xun Jiang <jxun@vmware.com>
 2023-06-30 11:13:04 +08:00
Xun Jiang/Bruce JiangGitHubXun Jiang
 		e106bbf06b Enable linter revive and resolve found errors: part 2. (#6177) 
Signed-off-by: Xun Jiang <blackpiglet@gmail.com>
Co-authored-by: Xun Jiang <blackpiglet@gmail.com>
 2023-04-26 14:05:22 +08:00
Xun Jiang bbc1e2e151 Enable stylecheck linter and resolve found issues. 
Signed-off-by: Xun Jiang <blackpiglet@gmail.com>
 2023-04-25 14:37:02 +08:00
Scott Seago 433d2d5e57 BIA/RIAv2 -- distinguish between New and InProgress operations 
Signed-off-by: Scott Seago <sseago@redhat.com>
 2023-03-21 18:55:59 -04:00
Scott Seago 2155b2b215 RIAv2 async operations controller work 
Signed-off-by: Scott Seago <sseago@redhat.com>
 2023-03-17 14:30:39 -04:00
Scott Seago a2621caa74 Wait for additional items to be ready before restoring current item 
Signed-off-by: Scott Seago <sseago@redhat.com>
 2023-03-13 15:26:45 -04:00
Wenkai Yin(尹文开) eb4ecd3767 Add restored resource list in the output of restore describe command 
Add restored resource list in the output of restore describe command

Fixes #5199

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
 2023-02-28 10:43:03 +08:00
Wenkai Yin(尹文开)andGitHub 4d0c3ac83f Restore finalizer and managedFields (#5853) 
Restore finalizer and managedFields of metadata during the restoration

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
 2023-02-20 10:26:45 +08:00
Scott SeagoandGitHub fa58a775e8 Merge pull request #5576 from anshulahuja98/backupresults 
Publish backup results to enhance error info
 2023-02-18 17:00:49 -05:00
Anshul Ahuja 8c3ddf0f73 Publish backup results extracted from backup logs 
Signed-off-by: Anshul Ahuja <anshulahuja@microsoft.com>
 2023-02-16 09:57:53 +05:30
Xun Jiang/Bruce JiangandGitHub 0b6b841f2a Remove redundant client from restore controller. (#5759) 
Signed-off-by: Xun Jiang <blackpiglet@gmail.com>
 2023-02-03 15:57:43 +08:00