Nothing Special   »   [go: up one dir, main page]

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

Add settings page and show quota usage and resource limits for the project #954

Merged
merged 1 commit into from
Feb 11, 2015

Conversation

jwforres
Copy link
Member
@jwforres jwforres commented Feb 9, 2015

No description provided.

@jwforres
Copy link
Member Author
jwforres commented Feb 9, 2015

@liggitt @derekwaynecarr

@jwforres
Copy link
Member Author
jwforres commented Feb 9, 2015

20150211_135908_

20150211_140353_

</dl>
<h2>
<span>Quota usage</span>
<a href="javascript:;" style="margin-left: 5px; cursor: pointer;" class="small pficon pficon-help" data-container="body" data-toggle="popover" data-placement="right" data-trigger="focus" data-content="Quota usage is aggregated for the whole project. Once the maximum for the project has been reached no more of that resource can be allocated within the project."></a>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@derekwaynecarr review this help message

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this render if and only if a quota is on for the project?

The message looks fine.

@derekwaynecarr
Copy link
Member

LGTM

@jwforres
Copy link
Member Author

Also happens to fix https://bugzilla.redhat.com/show_bug.cgi?id=1190070

<dd ng-if="project.displayName">{{project.displayName}}</dd>
<dd ng-if="!project.displayName"><em>No display name</em></dd>
<dt>Description:</dt>
<dd ng-if="project.metadata.annotations && project.metadata.annotations.description">{{project.metadata.annotations.description}}</dd>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is metadata.annotations.description a standard annotation? If so, should we make a filter to do this for us?

@jwforres jwforres force-pushed the quota branch 2 times, most recently from 3755504 to ec0880b Compare February 11, 2015 16:40
@liggitt
Copy link
Contributor
liggitt commented Feb 11, 2015

given the data from the API, I guess the units stuff is the best we can do

.filter('usageWithUnits', function() {
return function(value, type) {
// only special casing memory at the moment
var split = /([0-9]+)\s*(.*)/.exec(value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will the amount ever include a decimal?

@jwforres jwforres changed the title [WIP] Add settings page and show quota usage and resource limits for the project Add settings page and show quota usage and resource limits for the project Feb 11, 2015
</thead>
<tbody ng-repeat="limitRange in limitRanges">
<tr ng-repeat-start="limit in limitRange.spec.limits"></tr>
<tr ng-repeat="(type, min) in limit.min">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if min and max are not guaranteed to have the same set of resources, iterate over max to make sure we surface all max limits

@liggitt
Copy link
Contributor
liggitt commented Feb 11, 2015

LGTM

…ject

Also replace references to our custom $each with angular.forEach
@jwforres
Copy link
Member Author

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/892/) (Image: devenv-fedora_764)

@jwforres
Copy link
Member Author

unrelated failure [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin up to a11208b

openshift-bot pushed a commit that referenced this pull request Feb 11, 2015
Merged by openshift-bot
@openshift-bot openshift-bot merged commit ce6e806 into openshift:master Feb 11, 2015
@jwforres jwforres deleted the quota branch March 19, 2015 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants