Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 18:55:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11479 from ywk253100/200407_replication

Browse Source 
Fix replication bug
This commit is contained in:
Wenkai Yin(尹文开) 2020-04-07 22:41:19 +08:00 committed by GitHub
commit bf6c4ff1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/replication/adapter/harbor/base/adapter.go
View File

@ -33,18 +33,11 @@ import (
// New creates an instance of the base adapter
func New(registry *model.Registry) (*Adapter, error) {
if isLocalHarbor(registry) {
// when the adapter is created for local Harbor, returns the "http://127.0.0.1:8080"
// as URL to avoid issue https://github.com/goharbor/harbor-helm/issues/222
// when harbor is deployed on Kubernetes
url := "http://127.0.0.1:8080"
if common_http.InternalTLSEnabled() {
url = "https://127.0.0.1:8443"
}
authorizer := common_http_auth.NewSecretAuthorizer(registry.Credential.AccessSecret)
httpClient := common_http.NewClient(&http.Client{
Transport: common_http.GetHTTPTransport(common_http.SecureTransport),
}, authorizer)
client, err := NewClient(url, httpClient)
client, err := NewClient(registry.URL, httpClient)
if err != nil {
return nil, err
}
@ -52,7 +45,7 @@ func New(registry *model.Registry) (*Adapter, error) {
Adapter: native.NewAdapterWithAuthorizer(registry, authorizer),
Registry: registry,
Client: client,
url: url,
url: registry.URL,
httpClient: httpClient,
}, nil
}