Skip to content

Fix BackupRepositories becoming stale when BSL config changes while Velero is not running #9236

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.

Sign up for GitHub

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

Draft
kaovilai wants to merge 8 commits into
base: main
Choose a base branch
from
+1,287 −50
Draft

Fix BackupRepositories becoming stale when BSL config changes while Velero is not running #9236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84d74a6
Fix BackupRepositories becoming stale when BSL config changes while V…
kaovilai Sep 10, 2025
47a9a2b
Fix BackupRepositories becoming stale when BSL config changes while V…
kaovilai Sep 10, 2025
296124a
Add E2E test for backup repository startup validation
kaovilai Sep 10, 2025
875a6eb
fixup! Add E2E test for backup repository startup validation
kaovilai Sep 11, 2025
7b98e22
Enhance Backup Repository Handling for BSL Configuration Changes
kaovilai Dec 11, 2025
705332e
Delete invalidated BackupRepositories on BSL configuration changes to…
kaovilai Dec 23, 2025
92edafa
Refactor Backup Repository Handling to Recover from BSL Configuration…
kaovilai Dec 23, 2025
5a362b7
Fix cache race condition in runtime BSL change handling
kaovilai Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/e2e-test-kind.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ jobs:
\"Basic && (ClusterResource || NodePort || StorageClass)\", \
\"ResourceFiltering && !Restic\", \
\"ResourceModifier || (Backups && BackupsSync) || PrivilegesMgmt || OrderedResources\", \
\"(NamespaceMapping && Single && Restic) || (NamespaceMapping && Multiple && Restic)\"\
\"(NamespaceMapping && Single && Restic) || (NamespaceMapping && Multiple && Restic)\", \
\"BSL && BackupRepository && StartupValidation\"\
]}" >> $GITHUB_OUTPUT

# Run E2E test against all Kubernetes versions on kind
Expand Down
1 change: 1 addition & 0 deletions changelogs/unreleased/8279-kaovilai
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix BackupRepositories becoming stale when BSL config changes while Velero is not running
1 change: 1 addition & 0 deletions changelogs/unreleased/9236-kaovilai
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix BackupRepositories becoming stale when BSL config changes while Velero is not running
14 changes: 14 additions & 0 deletions pkg/apis/velero/v1/labels_annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ const (
// RepositoryTypeLabel is the label key used to identify the type of a repository
RepositoryTypeLabel = "velero.io/repository-type"

// BSL configuration annotations for BackupRepository to detect changes on startup
// BSLBucketAnnotation stores the BSL bucket configuration
BSLBucketAnnotation = "velero.io/bsl-bucket"
// BSLPrefixAnnotation stores the BSL prefix configuration
BSLPrefixAnnotation = "velero.io/bsl-prefix"
// BSLCACertAnnotation stores the BSL CA certificate
BSLCACertAnnotation = "velero.io/bsl-cacert"
// BSLConfigAnnotation stores the BSL config map as JSON
BSLConfigAnnotation = "velero.io/bsl-config"
// BSLLastInvalidatedAnnotation stores the timestamp when the repository was last
// invalidated due to BSL changes. This is used to ensure the informer cache is
// updated and the SpecChangePredicate passes the event for immediate reconciliation.
BSLLastInvalidatedAnnotation = "velero.io/bsl-last-invalidated"

// DataUploadLabel is the label key used to identify the dataupload for snapshot backup pod
DataUploadLabel = "velero.io/data-upload"

Expand Down
Loading
Loading