Skip to content

[OADP-8704] fix: only set region in BSL config for AWS CloudStorage #2397

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
PrasadJoshi12 wants to merge 3 commits into
base: oadp-dev
Choose a base branch
from
+13 −10
Open

[OADP-8704] fix: only set region in BSL config for AWS CloudStorage #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce01de5
[OADP-8704] fix: only set region in BSL config for AWS CloudStorage
PrasadJoshi12 Aug 20, 2026
8c2561d
Fix unit tests
PrasadJoshi12 Aug 20, 2026
7b39220
add defensive cleanup to remove region from non-aws BSLs
PrasadJoshi12 Aug 21, 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
19 changes: 13 additions & 6 deletions internal/controller/bsl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,12 @@ func (r *DataProtectionApplicationReconciler) ReconcileBackupStorageLocations(lo
}
}

// Add region from CloudStorage CR if specified
if bucket.Spec.Region != "" && bsl.Spec.Config == nil {
bsl.Spec.Config = make(map[string]string)
}
if bucket.Spec.Region != "" {
// Add region from CloudStorage CR only for AWS provider.
// Currently only AWS supports region in BSL config.
if bucket.Spec.Provider == oadpv1alpha1.AWSBucketProvider && bucket.Spec.Region != "" {
Comment thread
PrasadJoshi12 marked this conversation as resolved.
if bsl.Spec.Config == nil {
bsl.Spec.Config = make(map[string]string)
}
bsl.Spec.Config["region"] = bucket.Spec.Region
}

Expand All @@ -274,6 +275,12 @@ func (r *DataProtectionApplicationReconciler) ReconcileBackupStorageLocations(lo
bsl.Spec.Config[k] = v
}

// Defensive cleanup: region is only supported in BSL config for AWS.
// Remove stale region values that might remain from prior reconciliations
if bucket.Spec.Provider != oadpv1alpha1.AWSBucketProvider {
delete(bsl.Spec.Config, "region")
}

// Handle enableSharedConfig from CloudStorage CR
if bucket.Spec.EnableSharedConfig != nil && *bucket.Spec.EnableSharedConfig {
if bsl.Spec.Config == nil {
Expand Down Expand Up @@ -478,7 +485,7 @@ func (r *DataProtectionApplicationReconciler) populateBSLFromCloudStorage(bslSpe
}

// Add region if specified in CloudStorage
if cloudStorage.Spec.Region != "" {
if cloudStorage.Spec.Provider == oadpv1alpha1.AWSBucketProvider && cloudStorage.Spec.Region != "" {
bslSpec.Velero.Config["region"] = cloudStorage.Spec.Region
}

Expand Down
2 changes: 0 additions & 2 deletions internal/controller/bsl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3336,7 +3336,6 @@ func TestDPAReconciler_ReconcileBackupStorageLocations(t *testing.T) {
Config: map[string]string{
"storageAccount": "mystorageaccount",
"resourceGroup": "myresourcegroup",
"region": "eastus",
},
StorageType: velerov1.StorageType{
ObjectStorage: &velerov1.ObjectStorageLocation{
Expand Down Expand Up @@ -4675,7 +4674,6 @@ func TestDPAReconciler_populateBSLFromCloudStorage(t *testing.T) {
},
},
Config: map[string]string{
"region": "eastus",
"storageAccount": "mystorageaccount",
},
Credential: &corev1.SecretKeySelector{
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/cloudstorage_providers_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ func TestCloudStorageRefIntegrationGCP(t *testing.T) {
expectedBucket: "my-gcp-backup-bucket",
expectedConfig: map[string]string{
"project": "my-gcp-project",
"region": "us-central1",
},
},
{
Expand Down Expand Up @@ -427,7 +426,6 @@ func TestCloudStorageRefIntegrationGCP(t *testing.T) {
expectedBucket: "legacy-backup-bucket",
expectedConfig: map[string]string{
"project": "legacy-project",
"region": "us-west1",
"snapshotLocation": "us-west1",
},
},
Expand Down