github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8457 from davidopp/master

Browse Source 
Fix stylistic isues with #5547. Closes #4910.
This commit is contained in:
Brian Grant
2015-05-19 07:43:21 -07:00
parent 10339d72b6 44b1e1ca0c
commit 2c81050e6f
9 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/resource_helpers.go
View File

@@ -41,8 +41,8 @@ func (self *ResourceList) Memory() *resource.Quantity {
return &resource.Quantity{}
}
func (self *ResourceList) MaxPods() *resource.Quantity {
if val, ok := (*self)[ResourceMaxPods]; ok {
func (self *ResourceList) Pods() *resource.Quantity {
if val, ok := (*self)[ResourcePods]; ok {
return &val
}
return &resource.Quantity{}

3
pkg/api/types.go
View File

@@ -1245,8 +1245,7 @@ const (
ResourceMemory ResourceName = "memory"
// Volume size, in bytes (e,g. 5Gi = 5GiB = 5 * 1024 * 1024 * 1024)
ResourceStorage ResourceName = "storage"
// Number of Pods that may be running on this Node.
ResourceMaxPods ResourceName = "maxpods"
// Number of Pods that may be running on this Node: see ResourcePods
)
// ResourceList is a set of (resource name, quantity) pairs.