Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-29 00:05:09 +02:00
Code Issues Projects Releases Wiki Activity

Add aws China regions ECR support, both of cn-north-1 and cn-northwest-1 endpoints.

Browse Source 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
This commit is contained in:
Ziming Zhang 2020-08-27 19:14:31 +08:00 committed by Ziming
parent a651eb0949
commit bda66e9e1f
4 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.spec.ts
View File

@ -198,6 +198,14 @@ describe("CreateEditEndpointComponent (inline template)", () => {
{
"key": "sa-east-1",
"value": "https://api.ecr.sa-east-1.amazonaws.com"
},
{
"key": "cn-north-1",
"value": "https://api.ecr.cn-north-1.amazonaws.com.cn"
},
{
"key": "cn-northwest-1",
"value": "https://api.ecr.cn-northwest-1.amazonaws.com.cn"
}
]
},

9
src/portal/src/lib/components/endpoint/endpoint.component.spec.ts
View File

@ -185,7 +185,16 @@ describe("EndpointComponent (inline template)", () => {
{
"key": "sa-east-1",
"value": "https://api.ecr.sa-east-1.amazonaws.com"
},
{
"key": "cn-north-1",
"value": "https://api.ecr.cn-north-1.amazonaws.com.cn"
},
{
"key": "cn-northwest-1",
"value": "https://api.ecr.cn-northwest-1.amazonaws.com.cn"
}
]
},
"credential_pattern": null

8
src/replication/adapter/awsecr/adapter.go
View File

@ -189,6 +189,14 @@ func getAdapterInfo() *model.AdapterPattern {
Key: "sa-east-1",
Value: "https://api.ecr.sa-east-1.amazonaws.com",
},
{
Key: "cn-north-1",
Value: "https://api.ecr.cn-north-1.amazonaws.com.cn",
},
{
Key: "cn-northwest-1",
Value: "https://api.ecr.cn-northwest-1.amazonaws.com.cn",
},
},
},
}

22
src/replication/adapter/awsecr/adapter_test.go
View File

@ -49,6 +49,28 @@ func TestAdapter_NewAdapter(t *testing.T) {
assert.Nil(t, err)
assert.NotNil(t, adapter)
adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{
AccessKey: "xxx",
AccessSecret: "ppp",
},
URL: "https://api.ecr.test-china-region.amazonaws.com.cn",
})
assert.Nil(t, err)
assert.NotNil(t, adapter)
adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{
AccessKey: "xxx",
AccessSecret: "ppp",
},
URL: "https://123456.dkr.ecr.test-china-region.amazonaws.com.cn",
})
assert.Nil(t, err)
assert.NotNil(t, adapter)
adapter, err = newAdapter(&model.Registry{
Type: model.RegistryTypeAwsEcr,
Credential: &model.Credential{