upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 12:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment the related code for chart retention

Browse Source 
As we don't provide the capability for chart rerention currently, this commit comments related code

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin 2019-08-06 19:07:38 +08:00
parent 4f7e225e69
commit 0ac4ae687d
4 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/pkg/retention/dep/client.go
View File

@ -118,28 +118,30 @@ func (bc *basicClient) GetCandidates(repository *res.Repository) ([]*res.Candida
}
candidates = append(candidates, candidate)
}
case res.Chart:
charts, err := bc.coreClient.ListAllCharts(repository.Namespace, repository.Name)
if err != nil {
return nil, err
}
for _, chart := range charts {
labels := make([]string, 0)
for _, label := range chart.Labels {
labels = append(labels, label.Name)
/*
case res.Chart:
charts, err := bc.coreClient.ListAllCharts(repository.Namespace, repository.Name)
if err != nil {
return nil, err
}
candidate := &res.Candidate{
Kind: res.Chart,
Namespace: repository.Namespace,
Repository: repository.Name,
Tag: chart.Name,
Labels: labels,
CreationTime: chart.Created.Unix(),
PushedTime: time.Now().Unix() - (int64)((rand.Int31n(5)+5)*24*3600),
PulledTime: time.Now().Unix() - (int64)((rand.Int31n(4))*24*3600),
for _, chart := range charts {
labels := make([]string, 0)
for _, label := range chart.Labels {
labels = append(labels, label.Name)
}
candidate := &res.Candidate{
Kind: res.Chart,
Namespace: repository.Namespace,
Repository: repository.Name,
Tag: chart.Name,
Labels: labels,
CreationTime: chart.Created.Unix(),
PushedTime: ,
PulledTime: ,
}
candidates = append(candidates, candidate)
}
candidates = append(candidates, candidate)
}
*/
default:
return nil, fmt.Errorf("unsupported repository kind: %s", repository.Kind)
}
@ -154,8 +156,10 @@ func (bc *basicClient) DeleteRepository(repo *res.Repository) error {
switch repo.Kind {
case res.Image:
return bc.coreClient.DeleteImageRepository(repo.Namespace, repo.Name)
case res.Chart:
return bc.coreClient.DeleteChartRepository(repo.Namespace, repo.Name)
/*
case res.Chart:
return bc.coreClient.DeleteChartRepository(repo.Namespace, repo.Name)
*/
default:
return fmt.Errorf("unsupported repository kind: %s", repo.Kind)
}
@ -169,8 +173,10 @@ func (bc *basicClient) Delete(candidate *res.Candidate) error {
switch candidate.Kind {
case res.Image:
return bc.coreClient.DeleteImage(candidate.Namespace, candidate.Repository, candidate.Tag)
case res.Chart:
return bc.coreClient.DeleteChart(candidate.Namespace, candidate.Repository, candidate.Tag)
/*
case res.Chart:
return bc.coreClient.DeleteChart(candidate.Namespace, candidate.Repository, candidate.Tag)
*/
default:
return fmt.Errorf("unsupported candidate kind: %s", candidate.Kind)
}

32
src/pkg/retention/dep/client_test.go
View File

@ -91,16 +91,18 @@ func (c *clientTestSuite) TestGetCandidates() {
assert.Equal(c.T(), "hello-world", candidates[0].Repository)
assert.Equal(c.T(), "latest", candidates[0].Tag)
// chart repository
repository.Kind = res.Chart
repository.Namespace = "goharbor"
repository.Name = "harbor"
candidates, err = client.GetCandidates(repository)
require.Nil(c.T(), err)
assert.Equal(c.T(), 1, len(candidates))
assert.Equal(c.T(), res.Chart, candidates[0].Kind)
assert.Equal(c.T(), "goharbor", candidates[0].Namespace)
assert.Equal(c.T(), "1.0", candidates[0].Tag)
/*
// chart repository
repository.Kind = res.Chart
repository.Namespace = "goharbor"
repository.Name = "harbor"
candidates, err = client.GetCandidates(repository)
require.Nil(c.T(), err)
assert.Equal(c.T(), 1, len(candidates))
assert.Equal(c.T(), res.Chart, candidates[0].Kind)
assert.Equal(c.T(), "goharbor", candidates[0].Namespace)
assert.Equal(c.T(), "1.0", candidates[0].Tag)
*/
}
func (c *clientTestSuite) TestDelete() {
@ -118,10 +120,12 @@ func (c *clientTestSuite) TestDelete() {
err = client.Delete(candidate)
require.Nil(c.T(), err)
// chart
candidate.Kind = res.Chart
err = client.Delete(candidate)
require.Nil(c.T(), err)
/*
// chart
candidate.Kind = res.Chart
err = client.Delete(candidate)
require.Nil(c.T(), err)
*/
// unsupported type
candidate.Kind = "unsupported"

39
src/pkg/retention/launcher.go
View File

@ -334,10 +334,12 @@ func getProjects(projectMgr project.Manager) ([]*res.Candidate, error) {
func getRepositories(projectMgr project.Manager, repositoryMgr repository.Manager,
projectID int64, chartServerEnabled bool) ([]*res.Candidate, error) {
var candidates []*res.Candidate
pro, err := projectMgr.Get(projectID)
if err != nil {
return nil, err
}
/*
pro, err := projectMgr.Get(projectID)
if err != nil {
return nil, err
}
*/
// get image repositories
imageRepositories, err := repositoryMgr.ListImageRepositories(projectID)
if err != nil {
@ -351,20 +353,23 @@ func getRepositories(projectMgr project.Manager, repositoryMgr repository.Manage
Kind: "image",
})
}
if chartServerEnabled {
// get chart repositories when chart server is enabled
chartRepositories, err := repositoryMgr.ListChartRepositories(projectID)
if err != nil {
return nil, err
// currently, doesn't support retention for chart
/*
if chartServerEnabled {
// get chart repositories when chart server is enabled
chartRepositories, err := repositoryMgr.ListChartRepositories(projectID)
if err != nil {
return nil, err
}
for _, r := range chartRepositories {
candidates = append(candidates, &res.Candidate{
Namespace: pro.Name,
Repository: r.Name,
Kind: "chart",
})
}
}
for _, r := range chartRepositories {
candidates = append(candidates, &res.Candidate{
Namespace: pro.Name,
Repository: r.Name,
Kind: "chart",
})
}
}
*/
return candidates, nil
}

4
src/pkg/retention/launcher_test.go
View File

@ -192,7 +192,7 @@ func (l *launchTestSuite) TestGetProjects() {
func (l *launchTestSuite) TestGetRepositories() {
repositories, err := getRepositories(l.projectMgr, l.repositoryMgr, 1, true)
require.Nil(l.T(), err)
assert.Equal(l.T(), 3, len(repositories))
assert.Equal(l.T(), 2, len(repositories))
assert.Equal(l.T(), "library", repositories[0].Namespace)
assert.Equal(l.T(), "image", repositories[0].Repository)
assert.Equal(l.T(), "image", repositories[0].Kind)
@ -255,7 +255,7 @@ func (l *launchTestSuite) TestLaunch() {
}
n, err = launcher.Launch(ply, 1, false)
require.Nil(l.T(), err)
assert.Equal(l.T(), int64(3), n)
assert.Equal(l.T(), int64(2), n)
}
func (l *launchTestSuite) TestStop() {