diff --git a/README.md b/README.md index 7e0264fa4..040b0de15 100644 --- a/README.md +++ b/README.md @@ -11,17 +11,16 @@ |![notification](docs/img/bell-outline-badged.svg)Community Meeting| |------------------| -|The Harbor Project holds bi-weekly community calls, to join them and watch previous meeting notes and recordings, please see [meeting schedule](https://github.com/goharbor/community/blob/master/MEETING_SCHEDULE.md).| +|The Harbor Project holds bi-weekly community calls in two different timezones. To join the community calls or to watch previous meeting notes and recordings, please visit the [meeting schedule](https://github.com/goharbor/community/blob/master/MEETING_SCHEDULE.md).| -Welcome to join below Harbor community events and meet with project maintainers and users: +We welcome you to join the below Harbor community events and meet with project maintainers and users: -**May 20-24, 2019**, [KubeCon EU, Barcelona](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2019/): Harbor Community Reception, Intro and Deep-dive sessions. +**November 18-21, 2019**, [KubeCon US, San Diego](https://events19.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2019): Harbor Lunch & Learn led by Joe Beda, Intro and Deep-dive sessions. -**June 24-26, 2019**, [KubeCon Shanghai](https://www.lfasiallc.com/events/kubecon-cloudnativecon-china-2019/): Harbor community meetup, Harbor session.

**Note**: The `master` branch may be in an *unstable or even broken state* during development. -Please use [releases](https://github.com/vmware/harbor/releases) instead of the `master` branch in order to get stable binaries. +Please use [releases](https://github.com/vmware/harbor/releases) instead of the `master` branch in order to get a stable set of binaries. Harbor diff --git a/ROADMAP.md b/ROADMAP.md index 18738072a..00cbc8c5b 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,41 +1,12 @@ -## Harbor Roadmap - -### About this document - -This document provides description of items that are gathered from the community and planned in Harbor's roadmap. This should serve as a reference point for Harbor users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. - -### How to help? - -Discussion on the roadmap can take place in threads under [Issues](https://github.com/vmware/harbor/issues). Please open and comment on an issue if you want to provide suggestions and feedback to an item in the roadmap. Please review the roadmap to avoid potential duplicated effort. - -### How to add an item to the roadmap? -Please open an issue to track any initiative on the roadmap of Harbor. We will work with and rely on our community to focus our efforts to improve Harbor. - - ---- - -### 1. Notary -The notary feature allows publishers to sign their images offline and to push the signed content to a notary server. This ensures the authenticity of images. - -### 2. Vulnerability Scanning -The capability to scan images for vulnerability. - -### 3. Image replication enhancement -To provide more sophisticated rule for image replication. -- Image filtering by tags -- Replication can be scheduled at a certain time using a rule like: one time only, daily, weekly, etc. -- Image deletion can have the option not to be replicated to a remote instance. -- Global replication rule: Instead of setting the rule of individual project, system admin can set a global rule for all projects. -- Project admin can set replication policy of the project. - -### 4. Authentication (OAuth2) -In addition to LDAP/AD and local users, OAuth 2.0 can be used to authenticate a user. - -### 5. High Availability -Support multi-node deployment of Harbor for high availability, scalability and load-balancing purposes. - -### 6. Statistics and description for repositories -User can add a description to a repository. The access count of a repo can be aggregated and displayed. - -### 7. Migration tool to move from an existing registry to Harbor -A tool to migrate images from a vanilla registry server to Harbor, without the need to export/import a large amount of data. +## Harbor Roadmap + +### About this document + +This document provides a link to the [Harbor Project board](https://github.com/orgs/goharbor/projects/1) that serves as the up to date description of items that are in the Harbor release pipeline. The board has separate swim lanes for each release. Most items are gathered from the community or include a feedback loop with the community. This should serve as a reference point for Harbor users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. + +### How to help? + +Discussion on the roadmap can take place in threads under [Issues](https://github.com/goharbor/harbor/issues) or in [community meetings](https://github.com/goharbor/community/blob/master/MEETING_SCHEDULE.md). Please open and comment on an issue if you want to provide suggestions and feedback to an item in the roadmap. Please review the roadmap to avoid potential duplicated effort. + +### How to add an item to the roadmap? +Please open an issue to track any initiative on the roadmap of Harbor (Usually driven by new feature requests). We will work with and rely on our community to focus our efforts to improve Harbor. diff --git a/docs/installation_guide.md b/docs/installation_guide.md index d424464b5..c78c7606d 100644 --- a/docs/installation_guide.md +++ b/docs/installation_guide.md @@ -12,7 +12,7 @@ This guide describes the steps to install and configure Harbor by using the onli If you run a previous version of Harbor, you may need to update ```harbor.yml``` and migrate the data to fit the new database schema. For more details, please refer to **[Harbor Migration Guide](migration_guide.md)**. -In addition, the deployment instructions on Kubernetes has been created by the community. Refer to [Harbor on Kubernetes](kubernetes_deployment.md) for details. +In addition, the deployment instructions on Kubernetes has been created by the community. Refer to [Harbor on Kubernetes using Helm](https://github.com/goharbor/harbor-helm) for details. ## Harbor Components diff --git a/src/core/middlewares/interceptor/immutable/deletemf.go b/src/core/middlewares/interceptor/immutable/deletemf.go index b1b8e2495..6fb2e659a 100644 --- a/src/core/middlewares/interceptor/immutable/deletemf.go +++ b/src/core/middlewares/interceptor/immutable/deletemf.go @@ -29,6 +29,8 @@ func (dmf *delmfInterceptor) HandleRequest(req *http.Request) (err error) { artifactQuery := &models.ArtifactQuery{ Digest: dmf.mf.Digest, + Repo: dmf.mf.Repository, + PID: dmf.mf.ProjectID, } var afs []*models.Artifact afs, err = dao.ListArtifacts(artifactQuery) diff --git a/tests/apitests/python/test_project_quota.py b/tests/apitests/python/test_project_quota.py index 8ab8c842b..820568411 100644 --- a/tests/apitests/python/test_project_quota.py +++ b/tests/apitests/python/test_project_quota.py @@ -73,7 +73,7 @@ class TestProjects(unittest.TestCase): #5. Get project quota quota = self.system.get_project_quota("project", TestProjects.project_test_quota_id, **ADMIN_CLIENT) self.assertEqual(quota[0].used["count"], 1) - self.assertEqual(quota[0].used["storage"], 2791709) + self.assertEqual(quota[0].used["storage"], 2789174) #6. Delete repository(RA) by user(UA); self.repo.delete_repoitory(TestProjects.repo_name, **ADMIN_CLIENT)