From a7384fc8812bd4ea4435be699eaa10bf85c93f6a Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 10 May 2019 14:18:57 +0800 Subject: [PATCH] Fixes bug in replication Use internal service name rather than 127.0.0.1 when calling APIs of core in jobservice jobs Signed-off-by: Wenkai Yin --- src/replication/adapter/harbor/chart_registry.go | 8 ++++---- src/replication/adapter/harbor/image_registry.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/replication/adapter/harbor/chart_registry.go b/src/replication/adapter/harbor/chart_registry.go index 57abc64736..faa9749c5a 100644 --- a/src/replication/adapter/harbor/chart_registry.go +++ b/src/replication/adapter/harbor/chart_registry.go @@ -136,7 +136,7 @@ func (a *adapter) getChartInfo(name, version string) (*chartVersionDetail, error if err != nil { return nil, err } - url := fmt.Sprintf("%s/api/chartrepo/%s/charts/%s/%s", a.getURL(), project, name, version) + url := fmt.Sprintf("%s/api/chartrepo/%s/charts/%s/%s", a.url, project, name, version) info := &chartVersionDetail{} if err = a.client.Get(url, info); err != nil { return nil, err @@ -159,7 +159,7 @@ func (a *adapter) DownloadChart(name, version string) (io.ReadCloser, error) { if err != nil { return nil, err } - url = fmt.Sprintf("%s/chartrepo/%s/%s", a.getURL(), project, url) + url = fmt.Sprintf("%s/chartrepo/%s/%s", a.url, project, url) } req, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { @@ -189,7 +189,7 @@ func (a *adapter) UploadChart(name, version string, chart io.Reader) error { } w.Close() - url := fmt.Sprintf("%s/api/chartrepo/%s/charts", a.getURL(), project) + url := fmt.Sprintf("%s/api/chartrepo/%s/charts", a.url, project) req, err := http.NewRequest(http.MethodPost, url, buf) if err != nil { @@ -220,7 +220,7 @@ func (a *adapter) DeleteChart(name, version string) error { if err != nil { return err } - url := fmt.Sprintf("%s/api/chartrepo/%s/charts/%s/%s", a.getURL(), project, name, version) + url := fmt.Sprintf("%s/api/chartrepo/%s/charts/%s/%s", a.url, project, name, version) return a.client.Delete(url) } diff --git a/src/replication/adapter/harbor/image_registry.go b/src/replication/adapter/harbor/image_registry.go index c8d9fe75ab..c64c0c882c 100644 --- a/src/replication/adapter/harbor/image_registry.go +++ b/src/replication/adapter/harbor/image_registry.go @@ -146,7 +146,7 @@ func (a *adapter) listCandidateProjects(filters []*model.Filter) ([]*project, er // override the default implementation from the default image registry // by calling Harbor API directly func (a *adapter) DeleteManifest(repository, reference string) error { - url := fmt.Sprintf("%s/api/repositories/%s/tags/%s", a.getURL(), repository, reference) + url := fmt.Sprintf("%s/api/repositories/%s/tags/%s", a.url, repository, reference) return a.client.Delete(url) }