Skip to content

Commit

Permalink
fix cross account issue (#1283)
Browse files Browse the repository at this point in the history
* fix cross account issue

* update checksums
  • Loading branch information
vincentni authored Sep 12, 2022
1 parent b54cf5f commit ee7e5a6
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
8 changes: 4 additions & 4 deletions projects/goharbor/harbor/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
333980f91c33b43b6852f6d35e934e7a17d5b615d97245ba23ffe9d7654cbd10 _output/bin/harbor/linux-amd64/harbor-core
a70f774bb9a19a218aace71fd8a549b871b9cc55b3a7ba4e1e96cdc6a732b733 _output/bin/harbor/linux-amd64/harbor-core
a934807ee1d738344ce38062f1ea2f56d4f7f6e722fcabcbb791f70284117b9a _output/bin/harbor/linux-amd64/harbor-exporter
7bd3ebbebca485082a5107efbff3b39dba80fceb3927f3f0ee0ad05423bef73b _output/bin/harbor/linux-amd64/harbor-jobservice
0b2caee65f4e54aa471712ec8ee8f8186a44e50735fe9ca692716a4ea08cf640 _output/bin/harbor/linux-amd64/harbor-jobservice
afffee4bcc340a604e9e1575e5e45e64d70459a82cdbdfc65e467b56ce690e84 _output/bin/harbor/linux-amd64/harbor-migrate
943a43768e25cae79e05487119f50896a7cd18e638e4f4bd5192b879aeb3b361 _output/bin/harbor/linux-amd64/harbor-migrate-patch
b8cbaed07a24daa7c7c6090f832b49df96180691d58c942289e4af72e95c80d2 _output/bin/harbor/linux-amd64/harbor-registryctl
3438e2d21c4ee9300f9c3e4a0f78b49f7de58a8f3eb79bfa1ccb177b83a2f65d _output/bin/harbor/linux-arm64/harbor-core
407f9b6bef9d0c6efb1e1b3089bb03000b91927a29aaa09dcca8c62f04e945ca _output/bin/harbor/linux-arm64/harbor-core
8deb1cbb7ba6aea27648adc0f28d61f294936bdf96e54edda7b18f700020861f _output/bin/harbor/linux-arm64/harbor-exporter
6cad841d0a228bb730b9fd5c4f80d8ec44d5517ee90ff2c0518677c20ba48cca _output/bin/harbor/linux-arm64/harbor-jobservice
af50fef64babbfa64149b201eaaaa906a27a04d2ea5782f600f7e4c9d5972334 _output/bin/harbor/linux-arm64/harbor-jobservice
7c9be775e010427cff8c24399f7707888238770019975a5724ddda31e1a6194f _output/bin/harbor/linux-arm64/harbor-migrate
9e905c5e56df6c05d23e8ade83c141b7999cca1bb12410e330cf8636e0ce3eb4 _output/bin/harbor/linux-arm64/harbor-migrate-patch
2b4f5fe36f35e45721057f34662722683fdf2f73c22f1af958c82e7c561498ed _output/bin/harbor/linux-arm64/harbor-registryctl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From f9a5af021e8ca00ec5387cc3cbbc2d9786c854f1 Mon Sep 17 00:00:00 2001
From: Vincent Ni <[email protected]>
Date: Thu, 8 Sep 2022 12:52:32 -0700
Subject: [PATCH] fix cross account issue for aws ecr

---
src/pkg/reg/adapter/awsecr/adapter.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pkg/reg/adapter/awsecr/adapter.go b/src/pkg/reg/adapter/awsecr/adapter.go
index 1ad6ea11c..fdc8fae01 100644
--- a/src/pkg/reg/adapter/awsecr/adapter.go
+++ b/src/pkg/reg/adapter/awsecr/adapter.go
@@ -49,7 +49,7 @@ func newAdapter(registry *model.Registry) (*adapter, error) {
return nil, err
}
svc, err := getAwsSvc(
- region, registry.Credential.AccessKey, registry.Credential.AccessSecret, registry.Insecure, nil)
+ region, registry.Credential.AccessKey, registry.Credential.AccessSecret, registry.Insecure, &registry.URL)
if err != nil {
return nil, err
}
--
2.32.1 (Apple Git-133)

0 comments on commit ee7e5a6

Please sign in to comment.