Merge pull request #6991 from Lyndon-Li/release-1.12

[1.12] Issue 6988: udmrepo use region specified in BSL when s3URL is empty
vmware-tanzu · Oct 20, 2023 · bbc9790 · bbc9790
2 parents 905cd43 + 10744ec
commit bbc9790
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelogs/unreleased/6991-Lyndon-Li b/changelogs/unreleased/6991-Lyndon-Li
@@ -0,0 +1 @@
+Fix #6988, always get region from BSL if it is not empty
diff --git a/pkg/repository/provider/unified_repo.go b/pkg/repository/provider/unified_repo.go
@@ -480,9 +480,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)