From 3d841dd8f1f08693f10c1309e905a36e53f08b57 Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Fri, 20 Oct 2023 18:37:07 +0800 Subject: [PATCH] udmrepo use region specified in BSL when s3URL is empty Signed-off-by: Lyndon-Li --- changelogs/unreleased/6990-Lyndon-Li | 1 + pkg/repository/provider/unified_repo.go | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/6990-Lyndon-Li diff --git a/changelogs/unreleased/6990-Lyndon-Li b/changelogs/unreleased/6990-Lyndon-Li new file mode 100644 index 0000000000..6f79e1c9d2 --- /dev/null +++ b/changelogs/unreleased/6990-Lyndon-Li @@ -0,0 +1 @@ +Fix #6988, always get region from BSL if it is not empty \ No newline at end of file diff --git a/pkg/repository/provider/unified_repo.go b/pkg/repository/provider/unified_repo.go index 988174fa90..b98586fdb8 100644 --- a/pkg/repository/provider/unified_repo.go +++ b/pkg/repository/provider/unified_repo.go @@ -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)