-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Fix missing defaultVolumesToFsBackup flag output in Velero describe backup cmd #9056
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
Conversation
4b182dc to
421c7d7
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9056 +/- ##
=======================================
Coverage 60.06% 60.06%
=======================================
Files 379 379
Lines 43483 43486 +3
=======================================
+ Hits 26116 26119 +3
Misses 15801 15801
Partials 1566 1566 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
421c7d7 to
b91f294
Compare
b91f294 to
61b3584
Compare
61b3584 to
b89a33c
Compare
| Snapshot Move Data: auto | ||
| Data Mover: mover | ||
| Velero-Native Snapshot PVs: auto | ||
| Default Volumes to Fs Backup: auto |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- I think we need better wording to this field rather than "Default Volumes to Fs Backup". cc @Lyndon-Li
- I don't think "auto" is a valid value of this field, it has to be either "true" or "false"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- How about
Pod Volume Backup (Default):orFile System Backup (Default)? - How about
"<Not Set>"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shubham-pampattiwar It will only ever be "not set" before the backup controller reconciles it. If it's not set, then the default value from the server gets copied over. But that is a valid use case for describe, since a backup will be in that state for a while if another backup is currently running when it's created.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am somehow confused with the purpose:
- If we want to reflect the backup method, we don't need this field at all, because as @sseago mentioned, we don't know the backup method until the backup controller reconciles it; while, we already have this info in the volume info section.
- If we want to show backup options selected by users, it is enough to make a straight as:
Showing "Default to fs-backup" whendefault-to-fs-backupis true
Showing nothing otherwise
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Lyndon-Li Thats what the PR currently does, so the point of conflict is the usage of "auto" when its not set, right ? I see "auto" being already used for feilds like Velero-Native Snapshot PVs: in describe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shubham-pampattiwar I mean which is the purpose for this PR, 1 or 2?
If the purpose is 1, I don't think we need to add this change.
If the purpose is 2, we just need to show it when default-to-fs-backup is set.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Lyndon-Li the purpose is option 2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shubham-pampattiwar I'm not sure "auto" makes sense here. We use that for includeClusterResources since "auto" describes the behavior -- it's an intermediate state between "include all" and "exclude all" -- "include relevant ones only". But for defaultVolumesToFsBackup, nil just means "the controller hasn't filled in the server default value yet", which is a completely different meaning. Maybe "server default" instead of "auto" here? (in any case, once it's reconciled, it will be filled in with true or false)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated the PR to only describe/show it when default-to-fs-backup is set by the user.
9571ae4 to
85244a0
Compare
|
…ackup cmd Signed-off-by: Shubham Pampattiwar <[email protected]> add changelog file Signed-off-by: Shubham Pampattiwar <[email protected]> Show defaultVolumesToFsBackup in describe only when set by the user Signed-off-by: Shubham Pampattiwar <[email protected]> minor ut fix Signed-off-by: Shubham Pampattiwar <[email protected]> minor fix Signed-off-by: Shubham Pampattiwar <[email protected]>
85244a0 to
b551e4c
Compare
|
I think cc @sseago @Lyndon-Li thoughts? |
Yes, |
…ackup cmd (vmware-tanzu#9056) add changelog file Show defaultVolumesToFsBackup in describe only when set by the user minor ut fix minor fix Signed-off-by: Shubham Pampattiwar <[email protected]> (cherry picked from commit 60a6c73)
…ackup cmd (vmware-tanzu#9056) add changelog file Show defaultVolumesToFsBackup in describe only when set by the user minor ut fix minor fix Signed-off-by: Shubham Pampattiwar <[email protected]> (cherry picked from commit 60a6c73) update changelog filename Signed-off-by: Shubham Pampattiwar <[email protected]>
…ackup cmd (vmware-tanzu#9056) add changelog file Show defaultVolumesToFsBackup in describe only when set by the user minor ut fix minor fix Signed-off-by: Shubham Pampattiwar <[email protected]> (cherry picked from commit 60a6c73) update changelog filename Signed-off-by: Shubham Pampattiwar <[email protected]>
[release-1.16] Fix missing defaultVolumesToFsBackup flag output in Velero describe backup cmd (#9056)
…ackup cmd (vmware-tanzu#9056) add changelog file Show defaultVolumesToFsBackup in describe only when set by the user minor ut fix minor fix Signed-off-by: Shubham Pampattiwar <[email protected]>
* Add BSL status check for backup/restore operations. Signed-off-by: Xun Jiang <[email protected]> * Bump golang to v1.23.10 to fix CVEs for 1.16.2 release (vmware-tanzu#9058) * Bump golang to v1.23.10 to fix CVEs Signed-off-by: Adarsh Saxena <[email protected]> * Dockerfile restic miss 1.23.10 Signed-off-by: Tiger Kaovilai <[email protected]> * restic cve go1.23.10 Signed-off-by: Tiger Kaovilai <[email protected]> --------- Signed-off-by: Adarsh Saxena <[email protected]> Signed-off-by: Tiger Kaovilai <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> * Allow for proper tracking of multiple hooks per container Signed-off-by: Scott Seago <[email protected]> * Mounted cloud credentials should not be world-readable (vmware-tanzu#8919) (vmware-tanzu#9094) Signed-off-by: Scott Seago <[email protected]> * issue 9077: don't block backup deletion on list VS error (vmware-tanzu#9101) Signed-off-by: Lyndon-Li <[email protected]> * Fix missing defaultVolumesToFsBackup flag output in Velero describe backup cmd (vmware-tanzu#9056) add changelog file Show defaultVolumesToFsBackup in describe only when set by the user minor ut fix minor fix Signed-off-by: Shubham Pampattiwar <[email protected]> (cherry picked from commit 60a6c73) update changelog filename Signed-off-by: Shubham Pampattiwar <[email protected]> * Update Backup describe string for DefaultVolumesToFSBackup flag (vmware-tanzu#9105) add changelog file Signed-off-by: Shubham Pampattiwar <[email protected]> (cherry picked from commit aa2e09c) * Add imagePullSecrets inheritance for VGDP pod and maintenance job. (vmware-tanzu#9102) Signed-off-by: Xun Jiang <[email protected]> * Bump Golang, Ubuntu, and golang.org/x/oauth2 to fix CVEs. (vmware-tanzu#9104) Signed-off-by: Xun Jiang <[email protected]> * 1.16.2 changelog Signed-off-by: Lyndon-Li <[email protected]> * Bump the Velero and plugin image versions for the upgrade and migration tests. Signed-off-by: Xun Jiang <[email protected]> * skip subresource in resource discovery (vmware-tanzu#6688) Signed-off-by: lou <[email protected]> Co-authored-by: lou <[email protected]> * fix issue 6753 Signed-off-by: Lyndon-Li <[email protected]> * Update restore controller logic for restore deletion (vmware-tanzu#6761) 1. Skip deleting the restore files from storage if the backup/BSL is not found 2. Allow deleting the restore files from storage even though the BSL is readonly Signed-off-by: Wenkai Yin(尹文开) <[email protected]> * Fix vmware-tanzu#6752: add namespace exclude check. Add PSA audit and warn labels. Signed-off-by: Xun Jiang <[email protected]> * add csi snapshot data movement doc Signed-off-by: Lyndon-Li <[email protected]> * Modify changelogs for v1.12 Signed-off-by: allenxu404 <[email protected]> * issue 6786:always delete VSC regardless of the deletion policy Signed-off-by: Lyndon-Li <[email protected]> * issue: move plugin depdending podvolume functions to util pkg Signed-off-by: Lyndon-Li <[email protected]> * issue 6880: set ParallelUploadAboveSize as MaxInt64 Signed-off-by: Lyndon-Li <[email protected]> * changelog Signed-off-by: Tiger Kaovilai <[email protected]> * Add support for block volumes (vmware-tanzu#6680) (vmware-tanzu#6897) (cherry picked from commit 8e01d1b) Signed-off-by: David Zaninovic <[email protected]> * Replace the base image with paketobuildpacks image Replace the base image with paketobuildpacks image Fixes vmware-tanzu#6851 Signed-off-by: Wenkai Yin(尹文开) <[email protected]> * issue 6734: spread backup pod evenly Signed-off-by: Lyndon-Li <[email protected]> * Add doc links for new features to release note Signed-off-by: allenxu404 <[email protected]> * fix issue 6647 Signed-off-by: Lyndon-Li <[email protected]> * 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 <[email protected]> * issue vmware-tanzu#6807: Retry failed create when using generateName When creating resources with generateName, apimachinery does not guarantee uniqueness when it appends the random suffix to the generateName stub, so if it fails with already exists error, we need to retry. Signed-off-by: Scott Seago <[email protected]> * Import auth provider plugins Signed-off-by: Sebastian Glab <[email protected]> * Add v1.12.1 changelog Signed-off-by: allenxu404 <[email protected]> * Make Windows build skip BlockMode code. PVC block mode backup and restore introduced some OS specific system calls. Those calls are not available for Windows, so add both non Windows version and Windows version code, and return error for block mode on the Windows platform. Signed-off-by: Xun Jiang <[email protected]> * udmrepo use region specified in BSL when s3URL is empty Signed-off-by: Lyndon-Li <[email protected]> * Change v1.12.1 changelog Signed-off-by: allenxu404 <[email protected]> * Dockerfile.ubi/travis local files add UBI dockerfiles Use numeric user for velero-restic-restore-helper Enable multiarch builds (#135) Use arm64-graviton2 for arm builds (#137) Add required keys for arm builds (#139) Update Travis build job to work w/o changes on new branches Use a full VM for arm Use numeric non-root user for nonroot SCC compatibility * Add BZ + Publish automation to repo (#82) (cherry picked from commit ccb545f) Update PR-BZ automation mapping (#84) (cherry picked from commit aa2b019) Update PR-BZ automation (#92) Co-authored-by: Rayford Johnson <[email protected]> (cherry picked from commit ecc563f) Add publish workflow (#108) (cherry picked from commit f87b779) * remove dependabot config from fork * Create Makefile.prow Code-gen no longer required on verify due to vmware-tanzu#6039 Signed-off-by: Tiger Kaovilai <[email protected]> oadp-1.2: Update Makefile.prow to velero-restore-helper * set HOME in velero image for kopia, update controller-gen for CI (#280) Signed-off-by: Scott Seago <[email protected]> * build velero-helper binary for datamover pod * restore: Use warning when Create IsAlreadyExist and Get error Signed-off-by: Tiger Kaovilai <[email protected]> * kopia/repository/config/aws.go: Set session.Options profile from config Signed-off-by: Tiger Kaovilai <[email protected]> * use ubi9-latest to build * OADP-4225: add tzdata to Dockerfile.ubi * fix: CI (#316) Signed-off-by: Mateus Oliveira <[email protected]> * fix: ARM images (#332) * fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> * fixup! fix: ARM images Signed-off-by: Mateus Oliveira <[email protected]> --------- Signed-off-by: Mateus Oliveira <[email protected]> * ubi: BUILDPLATFORM to build stage to enable cross compile. (#336) Signed-off-by: Tiger Kaovilai <[email protected]> * OADP-4640: Downstream only to allow override kopia default algorithms (#334) (#338) add missing unit test for kopia hashing algo (#337) Introduction of downstream only option to override Kopia default: - hashing algorithm - splitting algorithm - encryption algorithm With introduction of 3 environment variables it is possible to override Kopia algorithms used by Velero: KOPIA_HASHING_ALGORITHM KOPIA_SPLITTER_ALGORITHM KOPIA_ENCRYPTION_ALGORITHM If the env algorithms are not set or they are not within Kopia SupportedAlgorithms, the default algorithm will be used. This behavior is consistent with current behavior without this change. Signed-off-by: Michal Pryc <[email protected]> Signed-off-by: Shubham Pampattiwar <[email protected]> * Downstream only: Rework of Makefile and incusion of lint The rework of Makefile to make it more readable and inclusion of lint as a target as well extract golangci-lint version from the upstream Dockerfile, so we test in PROW or locally on the same version as upstream. Signed-off-by: Michal Pryc <[email protected]> * Downstream only - fix lint error in downtream change (#343) This fixes the PR #334 where one additional line was in the code. This was not exposed previously as we did not had downstream CI Lint jobs. Signed-off-by: Michal Pryc <[email protected]> * run oadp-operator e2e test from the velero repo (#353) * run oadp-operator e2e test from the velero repo execute openshift/oadp-operator e2e tests directly against the velero repo locally or via prow ci Signed-off-by: Wesley Hayutin <[email protected]> * update variable names, add a cleanup * make sure env variable overrides default velero_image Signed-off-by: Wesley Hayutin <[email protected]> * add options to build, push, and only test Signed-off-by: Wesley Hayutin <[email protected]> * add arch to name Signed-off-by: Wesley Hayutin <[email protected]> * remove duplicated clean/rm operator checkout * simplify by dropping export var and use a oneliner Co-authored-by: Tiger Kaovilai <[email protected]> * drop export and use oneliner Co-authored-by: Tiger Kaovilai <[email protected]> * just in case, allow oadp to be deployed from makefile Signed-off-by: Wesley Hayutin <[email protected]> * Update Makefile.prow Co-authored-by: Tiger Kaovilai <[email protected]> --------- Signed-off-by: Wesley Hayutin <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> * DS Owners * updated controller-gen version * Include velero-restore-helper binary in velero image (#375) Co-authored-by: Scott Seago <[email protected]> * OADP-5952: downstream only, update error message disableFsBackup (#380) * OADP-5952: clear error for disableFsBackup This error message can be carried in OADP-1.5 Upstream issue: vmware-tanzu#8185 Signed-off-by: Wesley Hayutin <[email protected]> * fix error message and test --------- Signed-off-by: Wesley Hayutin <[email protected]> * Summary of Changes: (#381) Move PVC Request Size Patch to Backup CSI Action Shifted the logic that patches the PVC request size (to match the corresponding VolumeSnapshot size) from the CSI Restore action to the CSI Backup action. ✅ This enables restoring a PVC independently using label selectors, without requiring the VolumeSnapshot to be restored first. Include VolumeSnapshot in CSI Additional Items for PVC Added VolumeSnapshot as an additional item in the PVC CSI backup logic to ensure necessary metadata is available during restore. Include VolumeSnapshotContent in CSI Restore Additional Items Added VolumeSnapshotContent to the additional items in the CSI restore action to support a more complete restore workflow. ✅ This to make sure those resources are restored even if filters out by label from the resources list to restore Author: Amos Mastbaum <[email protected]> Signed-off-by: Amos Mastbaum <[email protected]> fixing-after-michal wait-for-vsc.Status.RestoreSize wait-for-vsc.Status.RestoreSize Update pkg/util/csi/volume_snapshot.go Update pkg/util/csi/volume_snapshot.go Update pkg/util/csi/volume_snapshot.go Co-authored-by: Scott Seago <[email protected]> * Prep for Konflux (#385) * Prep for Konflux * Update git submodule restic commit --------- Co-authored-by: Rayford Johnson <[email protected]> * Red Hat Konflux update oadp-velero-oadp-1-5 (#386) * Red Hat Konflux update oadp-velero-oadp-1-5 Signed-off-by: red-hat-konflux <[email protected]> * hermetic, prefetch-input --------- Co-authored-by: red-hat-konflux <[email protected]> Co-authored-by: Rayford Johnson <[email protected]> * Konflux: multiarch, tags, labels (#402) * build-platforms * generate-labels, LABELS * ADDITIONAL_TAGS --------- Co-authored-by: Rayford Johnson <[email protected]> * Red Hat Konflux update oadp-velero-oadp-1-5 (#411) * Red Hat Konflux update oadp-velero-oadp-1-5 Signed-off-by: red-hat-konflux <[email protected]> * Konflux: openshift-preflight: failed: HasLicense "suggestion": "Create a directory named /licenses and include all relevant licensing and/or terms and conditions as text file(s) in that directory." https://docs.redhat.com/en/documentation/red_hat_software_certification/2025/html-single/red_hat_openshift_software_certification_policy_guide/index#assembly-requirements-for-container-ima > Container images must contain a “licenses” directory. Use this > directory to add files containing software terms and conditions for your > product and any open source software included in the image. > > Test name: HasLicense --------- Co-authored-by: red-hat-konflux <[email protected]> Co-authored-by: Rayford Johnson <[email protected]> * chore(deps): update konflux references (#394) Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com> * chore(deps): update konflux references (#413) Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com> * add velero release to the velero container tags (#424) Signed-off-by: Wesley Hayutin <[email protected]> * oadp-1.5: Update Konflux references (#430) * oadp-1.5: Update Konflux references Update konflux-ci image references Changes committed via automation for oadp-1-5/velero. * Use restic's release branch --------- Co-authored-by: Rayford Johnson <[email protected]> --------- Signed-off-by: Xun Jiang <[email protected]> Signed-off-by: Adarsh Saxena <[email protected]> Signed-off-by: Tiger Kaovilai <[email protected]> Signed-off-by: Scott Seago <[email protected]> Signed-off-by: Lyndon-Li <[email protected]> Signed-off-by: Shubham Pampattiwar <[email protected]> Signed-off-by: lou <[email protected]> Signed-off-by: Wenkai Yin(尹文开) <[email protected]> Signed-off-by: Xun Jiang <[email protected]> Signed-off-by: allenxu404 <[email protected]> Signed-off-by: David Zaninovic <[email protected]> Signed-off-by: Sebastian Glab <[email protected]> Signed-off-by: Mateus Oliveira <[email protected]> Signed-off-by: Michal Pryc <[email protected]> Signed-off-by: Shubham Pampattiwar <[email protected]> Signed-off-by: Wesley Hayutin <[email protected]> Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: Xun Jiang <[email protected]> Co-authored-by: Wenkai Yin(尹文开) <[email protected]> Co-authored-by: Adarsh Saxena <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: Scott Seago <[email protected]> Co-authored-by: lyndon-li <[email protected]> Co-authored-by: Shubham Pampattiwar <[email protected]> Co-authored-by: Xun Jiang/Bruce Jiang <[email protected]> Co-authored-by: Lyndon-Li <[email protected]> Co-authored-by: Daniel Jiang <[email protected]> Co-authored-by: lou <[email protected]> Co-authored-by: Xun Jiang <[email protected]> Co-authored-by: allenxu404 <[email protected]> Co-authored-by: David Zaninovic <[email protected]> Co-authored-by: Sebastian Glab <[email protected]> Co-authored-by: Dylan Murray <[email protected]> Co-authored-by: RayfordJ <[email protected]> Co-authored-by: Mateus Oliveira <[email protected]> Co-authored-by: Wesley Hayutin <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]> Co-authored-by: OpenShift Cherrypick Robot <[email protected]> Co-authored-by: RayfordJ <[email protected]> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux <[email protected]>
Thank you for contributing to Velero!
Please add a summary of your change
Add missing defaultVolumesToFSBackup flag info to Velero describe cmd
Does your change fix a particular issue?
Fixes #9055
Please indicate you've done the following:
make new-changelog) or comment/kind changelog-not-requiredon this PR.site/content/docs/main.