Skip to content

Commit

Permalink
Merge pull request #29928 from dubstack/bump-libcontainer
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Bump Libcontainer to latest head

@Random-Liu or @yujuhong Can any one of you please do a quick review.

I updated libcontainer in a previous PR but  #29492 reverted those changes. This is needed for #27204. 

Signed-off-by: Buddha Prakash <buddhap@google.com>
  • Loading branch information
Kubernetes Submit Queue authored Aug 4, 2016
2 parents 0410c33 + 49201f6 commit d10e47b
Show file tree
Hide file tree
Showing 45 changed files with 870 additions and 411 deletions.
64 changes: 32 additions & 32 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions pkg/kubelet/cm/container_manager_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,13 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I

// Create a cgroup container manager.
func createManager(containerName string) *fs.Manager {
allowAllDevices := true
return &fs.Manager{
Cgroups: &configs.Cgroup{
Parent: "/",
Name: containerName,
Resources: &configs.Resources{
AllowAllDevices: true,
AllowAllDevices: &allowAllDevices,
},
},
}
Expand Down Expand Up @@ -319,15 +320,15 @@ func (cm *containerManagerImpl) setupNode() error {
}

glog.V(2).Infof("Configure resource-only container %s with memory limit: %d", cm.RuntimeCgroupsName, memoryLimit)

allowAllDevices := true
dockerContainer := &fs.Manager{
Cgroups: &configs.Cgroup{
Parent: "/",
Name: cm.RuntimeCgroupsName,
Resources: &configs.Resources{
Memory: memoryLimit,
MemorySwap: -1,
AllowAllDevices: true,
AllowAllDevices: &allowAllDevices,
},
},
}
Expand Down Expand Up @@ -370,12 +371,13 @@ func (cm *containerManagerImpl) setupNode() error {

if cm.KubeletCgroupsName != "" {
cont := newSystemCgroups(cm.KubeletCgroupsName)
allowAllDevices := true
manager := fs.Manager{
Cgroups: &configs.Cgroup{
Parent: "/",
Name: cm.KubeletCgroupsName,
Resources: &configs.Resources{
AllowAllDevices: true,
AllowAllDevices: &allowAllDevices,
},
},
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/util/resourcecontainer/resource_container_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ import (
//
// containerName must be an absolute container name.
func RunInResourceContainer(containerName string) error {
allowAllDevices := true
manager := fs.Manager{
Cgroups: &configs.Cgroup{
Parent: "/",
Name: containerName,
Resources: &configs.Resources{
AllowAllDevices: true,
AllowAllDevices: &allowAllDevices,
},
},
}
Expand Down
7 changes: 5 additions & 2 deletions vendor/github.com/opencontainers/runc/libcontainer/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/opencontainers/runc/libcontainer/SPEC.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d10e47b

Please sign in to comment.