-
Notifications
You must be signed in to change notification settings - Fork 375
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
workspace quota for project #2283
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #2283 +/- ##
==========================================
- Coverage 15.95% 15.77% -0.19%
==========================================
Files 1200 1218 +18
Lines 119058 123234 +4176
==========================================
+ Hits 18999 19437 +438
- Misses 98115 101796 +3681
- Partials 1944 2001 +57
|
70adf3a
to
a482714
Compare
johnlanni
previously approved these changes
Oct 18, 2021
/approve |
erda-bot
approved these changes
Oct 18, 2021
/cherry-pick release/1.3 |
Automated cherry pick failed, please resolve the confilcts and create PR manually.
|
johnlanni
pushed a commit
to johnlanni/erda
that referenced
this pull request
Oct 21, 2021
* feature: add workspace quota for project model * feature: add model ps_group_projects_quota * feature: add orm s_pod_info * feature: add fetch resource proto * feature: fetch resource * feature: Preliminary completion of the interface for querying cluster resources * feature: create project api on core-service side * feature: update the api for updating project * feature: update the api for updating project * feature: project details * feature: delete project * feature: project detail tips * feature: add PrepareCheckProjectResource todo comment * feature: config cmp grpc client * feature: add quota migration * feature:fix client addredd * feature: fix client address config yaml * fix:core-service config * feature: fix core-service config yaml * feature: fix grpc-client config * feature: block false * feature: rename resourceConfig * feature: block false * feature: update proto * feature: update proto * feature: udpate with proto * fix: modify cluster resource and namespace resource response * fix: typo * fix: typo * feature: add log * fix: typo * feature: unit transfered * fix: json tag * feature: add logs * fix: license * fix: NaN in json * fature: fmt * fix: query condition * feature: add log * rm .erda/migrations/core-services/20211014-project-quota.py * feature: add ut * feat: check quota * add get all namespaces * add get workspace quota * modify quota unit * remove resource precheck in orchestrator * feature: dedup cluster names * fix: license * feature: change quota algorithm * feature: add ut * add log * fix: GetWorkspaceQuota url path * modify apistruct * get runtimeID by instanceID for addon * fix: chinese in error info Co-authored-by: Craig <476479827@qq.com>
johnlanni
added a commit
that referenced
this pull request
Oct 21, 2021
* workspace quota for project (#2283) * feature: add workspace quota for project model * feature: add model ps_group_projects_quota * feature: add orm s_pod_info * feature: add fetch resource proto * feature: fetch resource * feature: Preliminary completion of the interface for querying cluster resources * feature: create project api on core-service side * feature: update the api for updating project * feature: update the api for updating project * feature: project details * feature: delete project * feature: project detail tips * feature: add PrepareCheckProjectResource todo comment * feature: config cmp grpc client * feature: add quota migration * feature:fix client addredd * feature: fix client address config yaml * fix:core-service config * feature: fix core-service config yaml * feature: fix grpc-client config * feature: block false * feature: rename resourceConfig * feature: block false * feature: update proto * feature: update proto * feature: udpate with proto * fix: modify cluster resource and namespace resource response * fix: typo * fix: typo * feature: add log * fix: typo * feature: unit transfered * fix: json tag * feature: add logs * fix: license * fix: NaN in json * fature: fmt * fix: query condition * feature: add log * rm .erda/migrations/core-services/20211014-project-quota.py * feature: add ut * feat: check quota * add get all namespaces * add get workspace quota * modify quota unit * remove resource precheck in orchestrator * feature: dedup cluster names * fix: license * feature: change quota algorithm * feature: add ut * add log * fix: GetWorkspaceQuota url path * modify apistruct * get runtimeID by instanceID for addon * fix: chinese in error info Co-authored-by: Craig <476479827@qq.com> * add grpc port for cmp (#2431) * Feature/read permission (#2437) * feat: change read permission to get, list and watch all resources * fix: read api-server host and port from env * fix: get k8sNamespace rather than namespace in s-pod-info (#2444) * fix update project quota error; i18n; tips (#2449) * feature: add workspace quota for project model * feature: add model ps_group_projects_quota * feature: fetch resource * feature: Preliminary completion of the interface for querying cluster resources * feature: project details * feature: add quota migration * feature: update proto * rm .erda/migrations/core-services/20211014-project-quota.py * feat: check quota * add get all namespaces * add get workspace quota * feature: add tips and i18n * feature: add tips * fix: project model * fix: tips * feature: fix update project quota error * feature: i18n * feature: add ut * fix: unit Co-authored-by: Craig <476479827@qq.com> * Bugfix/scheduler (#2459) * fix: create db client failed in scheduler * fix panic * fix i18n language codes error (#2457) * feature: add workspace quota for project model * fix: langCodes error fix: available resource calcus * feature: fix ut * Feature/quota audit (#2465) * feat: add quota audit * add result in audit * fix pods table and workload table panic * add project quota migration file * fix: query org name (#2468) * feature: add workspace quota for project model * fix: langCodes error fix: available resource calcus * fix: query org name * feature: add ut * fix: audit time * feature: add ut Co-authored-by: 悟空 <rainchan365@163.com> Co-authored-by: Craig <476479827@qq.com> Co-authored-by: CMC <49681321+CraigMChen@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of this PR
Add one of the following kinds:
/kind feature
/kind bug
/kind polish
/kind document
What this PR does / why we need it:
Which issue(s) this PR fixes:
Specified Reviewers:
/assign @your-reviewer
ChangeLog
Need cherry-pick to release versions?
Add comment like
/cherry-pick release/1.0
when this PR is merged.