github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues 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
commit e78834ab62
2 changed files with 11 additions and 10 deletions
Show Stats 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 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 { 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 { for name, quantity := range c.Resources.Requests {
r, ok := resources[name] r, ok := resources[name]
if !ok { if ok {
r = resource{} r.request = quantity.String()
continue
} }
r.request = quantity.String() resources[name] = &resource{limit: quantity.String(), request: quantity.String()}
resources[name] = r
} }
for name, res := range resources { for name, res := range resources {

8
pkg/kubelet/rkt/rkt_test.go
View File

@ -887,8 +887,8 @@ func TestSetApp(t *testing.T) {
Args: []string{"hello", "world", "$(env-bar)"}, Args: []string{"hello", "world", "$(env-bar)"},
WorkingDir: tmpDir, WorkingDir: tmpDir,
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Limits: api.ResourceList{"cpu": resource.MustParse("50m"), "memory": resource.MustParse("50M")}, Limits: api.ResourceList{"cpu": resource.MustParse("50m")},
Requests: api.ResourceList{"cpu": resource.MustParse("5m"), "memory": resource.MustParse("5M")}, Requests: api.ResourceList{"memory": resource.MustParse("5M")},
}, },
}, },
opts: &kubecontainer.RunContainerOptions{ opts: &kubecontainer.RunContainerOptions{
@ -934,8 +934,8 @@ func TestSetApp(t *testing.T) {
Isolators: []appctypes.Isolator{ Isolators: []appctypes.Isolator{
generateCapRetainIsolator(t, "CAP_SYS_CHROOT", "CAP_SYS_BOOT"), generateCapRetainIsolator(t, "CAP_SYS_CHROOT", "CAP_SYS_BOOT"),
generateCapRevokeIsolator(t, "CAP_SETUID", "CAP_SETGID"), generateCapRevokeIsolator(t, "CAP_SETUID", "CAP_SETGID"),
generateCPUIsolator(t, "5m", "50m"), generateCPUIsolator(t, "50m", "50m"),
generateMemoryIsolator(t, "5M", "50M"), generateMemoryIsolator(t, "5M", "5M"),
}, },
}, },
}, },