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

Merge pull request #20337 from yifan-gu/rkt_empty_isolator

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-02 09:56:04 -08:00
parent 5a099308f5 1b34e2c314
commit e78834ab62
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/rkt/rkt.go
View File

@@ -262,17 +262,18 @@ func setIsolators(app *appctypes.App, c *api.Container, ctx *api.SecurityContext
request string
}
resources := make(map[api.ResourceName]resource)
// If limit is empty, populate it with request and vice versa.
resources := make(map[api.ResourceName]*resource)
for name, quantity := range c.Resources.Limits {
resources[name] = resource{limit: quantity.String()}
resources[name] = &resource{limit: quantity.String(), request: quantity.String()}
}
for name, quantity := range c.Resources.Requests {
r, ok := resources[name]
if !ok {
r = resource{}
if ok {
r.request = quantity.String()
continue
}
r.request = quantity.String()
resources[name] = r
resources[name] = &resource{limit: quantity.String(), request: quantity.String()}
}
for name, res := range resources {