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

Fix bug for replicating chart triggered by event (#11578)

Browse Source 
Use the new event model to fix bug for replicating chart triggered by event

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin(尹文开) 2020-04-16 16:15:21 +08:00 committed by GitHub
parent 790064df2e
commit e3cbfac0cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chartserver/handler_manipulation.go
View File

@ -99,7 +99,11 @@ func (c *Controller) DeleteChartVersion(namespace, chartName, version string) er
Repository: &model.Repository{ Repository: &model.Repository{
Name: fmt.Sprintf("%s/%s", namespace, chartName), Name: fmt.Sprintf("%s/%s", namespace, chartName),
}, },
Vtags: []string{version}, Artifacts: []*model.Artifact{
{
Tags: []string{version},
},
},
}, },
}, },
} }

4
src/chartserver/reverse_proxy.go
View File

@ -118,14 +118,14 @@ func modifyResponse(res *http.Response) error {
}() }()
// Trigger harbor webhook // Trigger harbor webhook
if e != nil && e.Resource != nil && e.Resource.Metadata != nil && len(e.Resource.Metadata.Vtags) > 0 && if e != nil && e.Resource != nil && e.Resource.Metadata != nil && len(e.Resource.Metadata.Artifacts) > 0 &&
len(e.Resource.ExtendedInfo) > 0 { len(e.Resource.ExtendedInfo) > 0 {
event := &n_event.Event{} event := &n_event.Event{}
metaData := &metadata.ChartUploadMetaData{ metaData := &metadata.ChartUploadMetaData{
ChartMetaData: metadata.ChartMetaData{ ChartMetaData: metadata.ChartMetaData{
ProjectName: e.Resource.ExtendedInfo["projectName"].(string), ProjectName: e.Resource.ExtendedInfo["projectName"].(string),
ChartName: e.Resource.ExtendedInfo["chartName"].(string), ChartName: e.Resource.ExtendedInfo["chartName"].(string),
Versions: e.Resource.Metadata.Vtags, Versions: e.Resource.Metadata.Artifacts[0].Tags,
OccurAt: time.Now(), OccurAt: time.Now(),
Operator: e.Resource.ExtendedInfo["operator"].(string), Operator: e.Resource.ExtendedInfo["operator"].(string),
}, },

6
src/core/api/chart_repository.go
View File

@ -507,7 +507,11 @@ func (cra *ChartRepositoryAPI) addEventContext(files []formFile, request *http.R
"public": strconv.FormatBool(public), "public": strconv.FormatBool(public),
}, },
}, },
Vtags: []string{chartDetails.Metadata.Version}, Artifacts: []*model.Artifact{
{
Tags: []string{chartDetails.Metadata.Version},
},
},
}, },
ExtendedInfo: extInfo, ExtendedInfo: extInfo,
}, },