mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2025-12-23 06:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6990 from Lyndon-Li/udmrepo-use-region-from-bsl

Browse Source 
Issue 6988: udmrepo use region specified in BSL when s3URL is empty
This commit is contained in:
Daniel Jiang
2023-10-20 20:15:36 +08:00
committed by GitHub
parent fd8350f919 3d841dd8f1
commit 5fe53daf21
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/6990-Lyndon-Li Normal file
View File

@@ -0,0 +1 @@
Fix #6988, always get region from BSL if it is not empty

8
pkg/repository/provider/unified_repo.go
View File

@@ -477,9 +477,11 @@ func getStorageVariables(backupLocation *velerov1api.BackupStorageLocation, repo
var err error
if s3URL == "" {
region, err = getS3BucketRegion(bucket)
if err != nil {
return map[string]string{}, errors.Wrap(err, "error get s3 bucket region")
if region == "" {
region, err = getS3BucketRegion(bucket)
if err != nil {
return map[string]string{}, errors.Wrap(err, "error get s3 bucket region")
}
}
s3URL = fmt.Sprintf("s3-%s.amazonaws.com", region)