Skip to content

[oadp-1.4] OADP-8835: feat(bsl): concatenate all CA certificates from BSLs and include system defaults #2466

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

Open
redhat-chai-bot wants to merge 5 commits into
base: oadp-1.4
Choose a base branch
from
Open

[oadp-1.4] OADP-8835: feat(bsl): concatenate all CA certificates from BSLs and include system defaults #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da4f1cc
oadp-1.5: OADP-6765: feat(bsl): concatenate all CA certificates from …
kaovilai Sep 30, 2025
71b3622
fix: include missing bsl.go changes from original PR
redhat-chai-bot Sep 23, 2026
f7f0c7b
fix: align DPA namespace with CloudStorage namespace in test
redhat-chai-bot Sep 23, 2026
6b45016
OADP-8835: fix CA cert ConfigMap creation in processCACertForBSLs
redhat-chai-bot Sep 23, 2026
9a0d516
OADP-8835: add DPA owner reference on velero-ca-bundle ConfigMap
redhat-chai-bot Sep 23, 2026
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
278 changes: 256 additions & 22 deletions controllers/bsl.go
View file
Open in desktop

Large diffs are not rendered by default.

855 changes: 851 additions & 4 deletions controllers/bsl_test.go
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions controllers/velero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,11 @@ func (r *DPAReconciler) customizeVeleroDeployment(dpa *oadpv1alpha1.DataProtecti
}
}

// Process CA certificates from BackupStorageLocations
if err := r.processCACertificatesForVelero(dpa, veleroDeployment, veleroContainer); err != nil {
return fmt.Errorf("failed to process CA certificates: %w", err)
// Process CA certificates from BackupStorageLocations if backupImages is true or nil (nil means true)
if dpa.BackupImages() {
if err := r.processCACertificatesForVelero(dpa, veleroDeployment, veleroContainer); err != nil {
return fmt.Errorf("failed to process CA certificates: %w", err)
}
}

return nil
Expand Down
Loading
Loading