Commit Graph
6514 Commits
Author SHA1 Message Date
Shubham Pampattiwar 2be71e3c3b Add docs, example ConfigMap, describer, and review fixes
- Add Default Resource Modifiers section to restore-resource-modifiers.md
- Add --default-resource-modifier-configmap to customize-installation.md
- Add examples/default-resource-modifier-cni.yaml with CNI annotation
  stripping rules for OVN-K and Multus
- Update restore describer to show SkipDefaultResourceModifier when set
- Log warning when ResourceModifier Kind is not ConfigMap instead of
  silently doing nothing
- Add deployment_test.go coverage for the new server flag

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:48 -07:00
Shubham Pampattiwar a6f800c591 Address review feedback on default resource modifier
- Fix fallthrough bug: when ResourceModifier is set with a non-ConfigMap
  kind, do not fall through to applying the server default. The outer
  check on ResourceModifier != nil now prevents default application
  regardless of the Kind value.
- Include underlying error in fatal validation message for ConfigMap
  retrieval failures.
- Strengthen exclusive precedence test: default ConfigMap intentionally
  does not exist while per-restore does, proving the default is never
  consulted.
- Add test for invalid default ConfigMap data (non-fatal, warn and
  proceed).

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:48 -07:00
Shubham Pampattiwar d87a66393d Add changelog for PR #10098
Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:48 -07:00
Shubham Pampattiwar c509e5369c Wire default resource modifier through install path and builder
Add --default-resource-modifier-configmap to the install CLI and
deployment builder so administrators can configure it during velero
install. Wire through VeleroOptions and podTemplateConfig following
the existing --backup-repository-configmap pattern.

Add SkipDefaultResourceModifier builder method to RestoreBuilder.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:47 -07:00
Shubham Pampattiwar 34bc3c7e1a Add --skip-default-resource-modifier flag to restore CLI
When set, the server-configured default resource modifier is skipped
for this restore. Only sets the *bool field when the flag is true,
leaving it nil otherwise.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:47 -07:00
Shubham Pampattiwar 8ef8ab3b1d Implement default resource modifier in restore controller
Thread DefaultResourceModifierConfigMap from server config through to
restoreReconciler. Refactor validateAndComplete to use a shared
loadResourceModifierConfigMap helper that handles both default and
per-restore ConfigMap loading.

Precedence: per-restore modifier takes exclusive precedence over the
default. Default ConfigMap errors are non-fatal (warn and proceed).
SkipDefaultResourceModifier opt-out is respected.

Includes unit tests covering: default-only, per-restore override,
skip flag, missing default (non-fatal), missing per-restore (fatal),
and no modifier configured.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:47 -07:00
Shubham Pampattiwar 70e70f14e2 Add SkipDefaultResourceModifier field to RestoreSpec
Add *bool field following existing RestoreSpec conventions (RestorePVs,
PreserveNodePorts, IncludeClusterResources). When true, the server
default resource modifier is skipped for this restore.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:47 -07:00
Shubham Pampattiwar f011fc4ef6 Add --default-resource-modifier-configmap server flag
Add DefaultResourceModifierConfigMap field to the server Config struct
and bind it as a CLI flag. When set, it references a ConfigMap name in
the Velero namespace containing default resource modifier rules to apply
to all restores.

Follows the existing pattern used by --backup-repository-configmap and
--repo-maintenance-job-configmap.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-08-03 13:19:38 -07:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b74f8c9511 Bump github/codeql-action from 3 to 4.37.3 (#10135)
e2e-test-kind.yaml / extract (push) Failing after 11s
Run the E2E test on kind / get-go-version (push) Failing after 13s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 13s
Main CI / get-go-version (push) Successful in 13s
Main CI / Build (push) Failing after 21s
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4.37.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v3...v4.37.3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-08-03 13:37:25 -04:00
Shubham PampattiwarandGitHub 6e511f2c80 Merge pull request #10146 from blackpiglet/jxun/modify_parent_snapshot_in_data_mover_when_is_none
Modify the ParentSnapshot to "" and ForceFull to true when ParentSnapshot is "none".
2026-08-03 09:59:48 -07:00
Xun Jiang c3ef38c225 Modify the ParentSnapshot to "" and ForceFull to true when ParentSnapshot is "none".
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
2026-08-03 18:02:36 +08:00
Xun Jiang/Bruce JiangandGitHub ddbe054b33 Merge pull request #10144 from Lyndon-Li/empty-sa-namespace-for-get-changed-blocks
Run the E2E test on kind / setup-test-matrix (push) Successful in 4s
e2e-test-kind.yaml / extract (push) Failing after 11s
Run the E2E test on kind / get-go-version (push) Failing after 13s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 11s
Main CI / get-go-version (push) Successful in 12s
Main CI / Build (push) Failing after 38s
Empty sa namespace when secret is empty for getChangedBlocks
2026-08-03 17:38:51 +08:00
Lyndon-Li 1249e69999 empty sa namespace when secret is empty for getChangedBlocks
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-08-03 17:09:30 +08:00
Xun Jiang/Bruce JiangandGitHub c832bb767e Merge pull request #10142 from Lyndon-Li/upload-progerss-interval
Upload progress every 10s
2026-08-03 16:00:32 +08:00
Xun Jiang/Bruce JiangandGitHub ef95e11c8f Merge pull request #10140 from Lyndon-Li/set-cbt-service-to-uploader
Set CBT service to uploader
2026-08-03 14:35:42 +08:00
Lyndon-Li f22b7c86d7 upload progress every 10s
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-08-03 14:11:37 +08:00
Lyndon-Li 036e9944e4 empty CBT secret ns when secret is not set
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-08-03 13:52:20 +08:00
Lyndon-Li 8fe02224b9 set CBT service to uploader
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-08-03 13:25:18 +08:00
lyndon-liandGitHub 70478f4377 Merge pull request #10126 from blackpiglet/jxun/parent_snapshot
Run the E2E test on kind / setup-test-matrix (push) Successful in 6s
e2e-test-kind.yaml / extract (push) Failing after 17s
Run the E2E test on kind / get-go-version (push) Failing after 18s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 12s
Main CI / get-go-version (push) Successful in 13s
Main CI / Build (push) Failing after 40s
Use "" as parentSnapshot for DU when BackupType is incremental.
2026-07-31 17:52:30 +08:00
Xun Jiang f0797c9104 Use "" as parentSnapshot for DU when BackupType is incremental.
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
2026-07-31 16:24:17 +08:00
Shubham PampattiwarandGitHub 0c2b588f5a Merge pull request #10124 from shubham-pampattiwar/site/cncf-sandbox-blog-post
Run the E2E test on kind / setup-test-matrix (push) Successful in 5s
e2e-test-kind.yaml / extract (push) Failing after 16s
Run the E2E test on kind / get-go-version (push) Failing after 17s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 12s
Main CI / get-go-version (push) Successful in 12s
Main CI / Build (push) Failing after 28s
Site: add blog post for Velero joining CNCF Sandbox
2026-07-30 13:02:15 -07:00
Shubham Pampattiwar 96bf9e2ec1 site: add blog post for Velero joining CNCF Sandbox
Announce Velero's acceptance into the CNCF Sandbox, covering the
governance change, project history, current maintainers, and how
to get involved. This is the first blog post since v1.11 in 2023.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-07-30 12:12:42 -07:00
Shubham PampattiwarandGitHub 95e76381fd Site: update homepage CTA and add LinkedIn to footer (#10113)
* site: update homepage CTA and add LinkedIn to footer

Replace stale 'How Do You Use Velero?' link (GitHub issue #1327 from 2019)
with 'Join the Velero Community' pointing to the community page.

Add the new Velero LinkedIn page to the footer social links.

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

* site: fix invisible CNCF logo in footer

The footer uses a white background but the CNCF logo was a white SVG
(cncf-white.svg), making it invisible. Switch to the color version
from the CNCF artwork repository.

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

---------

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-07-30 12:27:15 -04:00
Chlins ZhangandGitHub 9063ee5fb7 Replace rebase action with GitHub CLI (#10093)
* Replace rebase action with GitHub CLI

Signed-off-by: chlins <chlins.zhang@gmail.com>

* Add contents write permission for rebase workflow

Updating the PR branch pushes to the head branch, which requires contents: write for the GITHUB_TOKEN.

Signed-off-by: chlins <chlins.zhang@gmail.com>

---------

Signed-off-by: chlins <chlins.zhang@gmail.com>
2026-07-30 12:24:51 -04:00
Chlins ZhangandGitHub c1f3e81484 Merge pull request #10094 from chlins/fix/pin-prow-action
Run the E2E test on kind / setup-test-matrix (push) Successful in 6s
e2e-test-kind.yaml / extract (push) Failing after 16s
Run the E2E test on kind / get-go-version (push) Failing after 17s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 11s
Main CI / get-go-version (push) Successful in 12s
Main CI / Build (push) Failing after 36s
Pin prow GitHub action to commit SHA
2026-07-30 14:42:17 +08:00
lyndon-liandGitHub d3692d08ed Merge pull request #10105 from Lyndon-Li/optimize-sub-object-description
Optimize sub object description
2026-07-30 14:16:57 +08:00
Lyndon-Li c7d7801ae9 Merge branch 'main' into optimize-sub-object-description 2026-07-29 18:09:28 +08:00
5691f7f29d Support overriding Schedule annotations via template.metadata.annotations (#10045)
Run the E2E test on kind / setup-test-matrix (push) Successful in 4s
e2e-test-kind.yaml / extract (push) Failing after 13s
Run the E2E test on kind / get-go-version (push) Failing after 14s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 14s
Main CI / get-go-version (push) Successful in 16s
Main CI / Build (push) Failing after 2m46s
* Support overriding Schedule annotations via template.metadata.annotations

Adds an Annotations field to BackupSpec.Metadata, mirroring the existing
Labels override. When Schedule.Spec.Template.Metadata.Annotations is set,
it is used for the resulting Backup's annotations instead of copying
Schedule.Annotations directly, allowing users to opt out of unwanted
annotations (e.g. ArgoCD tracking annotations) being propagated from
Schedule to Backup.

Fixes #5836

Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>

* Rename changelog fragment to match PR number 10045

Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>

---------

Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>
Co-authored-by: Daniel Jiang <daniel.jiang@broadcom.com>
2026-07-29 15:55:51 +08:00
5ca38aa075 ci(push): pin action versions to commit SHAs and restrict permissions (#10083)
Signed-off-by: chlins <chlins.zhang@gmail.com>
Co-authored-by: Daniel Jiang <daniel.jiang@broadcom.com>
2026-07-29 07:41:57 +00:00
chlins 4745c45faf Pin prow GitHub action to commit SHA
Signed-off-by: chlins <chlins.zhang@gmail.com>
2026-07-29 15:11:08 +08:00
Adam ZhangandGitHub 0027460717 Merge pull request #10087 from adam-jian-zhang/fix-vsc-hardcode
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
e2e-test-kind.yaml / extract (push) Failing after 12s
Run the E2E test on kind / get-go-version (push) Failing after 13s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 11s
Main CI / get-go-version (push) Successful in 15s
Main CI / Build (push) Failing after 33s
remove VolumeSnapshotContent from resourceMustHave
2026-07-29 11:10:10 +08:00
Scott SeagoandGitHub 041f577343 Merge branch 'main' into fix-vsc-hardcode 2026-07-28 20:21:50 -04:00
lyndon-liandGitHub f59217b9ea Merge pull request #10091 from Lyndon-Li/block-uploader-thread-module-refactor
Run the E2E test on kind / setup-test-matrix (push) Successful in 4s
e2e-test-kind.yaml / extract (push) Failing after 12s
Run the E2E test on kind / get-go-version (push) Failing after 13s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 11s
Main CI / get-go-version (push) Successful in 12s
Main CI / Build (push) Failing after 23s
Refactor block uploader thread module
2026-07-28 18:45:43 +08:00
Adam Zhang 63cfddd18d add tests to cover pvc and vsc ria
Signed-off-by: Adam Zhang <adam.zhang@broadcom.com>
2026-07-28 16:06:04 +08:00
Lyndon-Li d685b818ad refactor block uploader thread module
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-07-28 15:43:13 +08:00
Lyndon-Li 525fb9eaa2 Merge branch 'main' into optimize-sub-object-description 2026-07-28 15:14:15 +08:00
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
Lyndon-Li a389cb4560 Merge branch 'main' into block-uploader-thread-module-refactor 2026-07-28 13:21:28 +08:00
Lyndon-Li b635d3f8ed refactor block uploader thread module
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-07-28 13:20:34 +08:00
Chlins ZhangandGitHub c95597720a build(image): remove kubectl installation from build image (#10065)
Run the E2E test on kind / setup-test-matrix (push) Successful in 4s
e2e-test-kind.yaml / extract (push) Failing after 12s
Run the E2E test on kind / get-go-version (push) Failing after 13s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
build-image / Build (push) Failing after 12s
push.yml / extract (push) Successful in 12s
Main CI / get-go-version (push) Successful in 13s
Main CI / Build (push) Failing after 27s
Signed-off-by: chlins <chlins.zhang@gmail.com>
2026-07-27 19:34:38 -04: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
lyndon-liandGitHub 1711094110 Merge pull request #10071 from Lyndon-Li/block-uploader-restore-implementation
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
e2e-test-kind.yaml / extract (push) Failing after 15s
Run the E2E test on kind / get-go-version (push) Failing after 16s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Successful in 13s
Main CI / get-go-version (push) Successful in 14s
Main CI / Build (push) Failing after 1m6s
Block uploader restore implementation
2026-07-27 15:40:52 +08:00
Xun Jiang/Bruce JiangandGitHub 3905ccb0ea Backup workflow for block data mover. (#10067)
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
2026-07-27 15:36:44 +08:00
Adam ZhangandGitHub d2c46dad7a Merge pull request #10056 from adam-jian-zhang/ria-must-include-design
design for RIA must-include-additional-items
2026-07-27 15:08:05 +08:00
Xun Jiang/Bruce JiangandGitHub ae772382a8 Merge pull request #10062 from shubham-pampattiwar/remove-health-files
Remove community health files now provided by org-level .github repo
2026-07-27 15:07:56 +08:00
Shubham PampattiwarandGitHub 77e119c274 Fix stale 'Latest Release Information' link on velero.io (#10081)
Update the landing page CTA link from the outdated Velero 1.11 blog
post to the GitHub releases/latest URL, which always resolves to the
most recent release and will not go stale.

Fixes #10080

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
2026-07-27 15:05:44 +08:00
Lyndon-Li bc596da386 block uploader restore implementation
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
2026-07-27 14:19:22 +08:00
Lyndon-Li d81b319abf Merge branch 'main' into block-uploader-restore-implementation 2026-07-27 14:12:06 +08:00
Xun Jiang/Bruce JiangandGitHub 713c2f3b0a Merge pull request #10074 from velero-io/dependabot/github_actions/codecov/codecov-action-7
Bump codecov/codecov-action from 6 to 7
2026-07-27 13:47:56 +08:00
Xun Jiang/Bruce JiangandGitHub 07ab16ffc0 Merge pull request #10075 from velero-io/dependabot/github_actions/actions/labeler-7
Bump actions/labeler from 5 to 7
2026-07-27 13:46:15 +08:00