Skip to content
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

feat: Add avalibale quota tip when edting project resource default quota #2619

Merged

Conversation

weili520
Copy link
Contributor

@weili520 weili520 commented Nov 17, 2021

Signed-off-by: TheYoungManLi cjl@kubesphere.io

What type of PR is this?

/kind feature

What this PR does / why we need it:

The project resource default quota maximum should be the smallest of workspace lefted quota and namespace quota limit.

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

The workspace lcj-auto-quota's has two single cluster project in it: test2、lcj-test1. 
The quota of cluster rohan as follows:
   requests.cpu: 1 Core   requests.memory: 1 G
   limits.cpu: 4 Core     limits.cpu: 8 Core

the lcj-test1 project quota is: 
   request.cpu: 0.9 Core  reqests.memory: Not limit
   limits.cpu: Not limit  limits.cpu: 6.5 Core

so container default quota maximum is : 
   request.cpu: 0.9 Core  reqests.memory: 1 G
   limits.cpu: 4 Core     limits.cpu: 6.5 G

For multi cluster project, it also work on this, It will compares all cluster quota limit.
2021-11-17.14.04.36.mov

Does this PR introduced a user-facing change?

Add avaliable quota tip when edting project resource default quota.

Additional documentation, usage docs, etc.:

@ks-ci-bot ks-ci-bot added release-note-none kind/feature Categorizes issue or PR as related to a new feature. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note and removed release-note-none labels Nov 17, 2021
@harrisonliu5
Copy link
Contributor

/assign @xuliwenwenwen

Signed-off-by: TheYoungManLi <cjl@kubesphere.io>
@weili520 weili520 force-pushed the update_resource_default_available_quota branch from 295c82f to 4d16001 Compare November 22, 2021 06:31
@xuliwenwenwen
Copy link
Contributor

/lgtm

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 23, 2021
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 73c8338214a0821fad4735588d2cd98913314247

@harrisonliu5
Copy link
Contributor

/approve

@harrisonliu5
Copy link
Contributor

/cherrypick release-3.2

@ks-ci-bot
Copy link
Collaborator

@harrisonliu5: once the present PR merges, I will cherry-pick it on top of release-3.2 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harrisonliu5, weili520

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 23, 2021
@ks-ci-bot ks-ci-bot merged commit 03dcf9b into kubesphere:master Nov 23, 2021
@ks-ci-bot
Copy link
Collaborator

@harrisonliu5: #2619 failed to apply on top of branch "release-3.2":

Applying: feat: Add avalibale quotas tip when edting project resource default
Using index info to reconstruct a base tree...
M	src/pages/fedprojects/containers/Overview/LimitRange/index.jsx
Falling back to patching base and 3-way merge...
Auto-merging src/pages/fedprojects/containers/Overview/LimitRange/index.jsx
CONFLICT (content): Merge conflict in src/pages/fedprojects/containers/Overview/LimitRange/index.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: Add avalibale quotas tip when edting project resource default
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-3.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot
Copy link
Collaborator

@harrisonliu5: new issue created for failed cherrypick: #2642

In response to this:

/cherrypick release-3.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@weili520 weili520 deleted the update_resource_default_available_quota branch December 2, 2021 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants