Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump runc to v1.1.3 #5972

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.

Sign up for GitHub

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

Merged
openshift-ci merged 3 commits into from
Jun 22, 2022
Merged

Bump runc to v1.1.3 #5972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b3153d
Bump runc to v1.1.3
saschagrunert Jun 15, 2022
de8672f
contrib/test/int/build/runc: rm build tags
kolyshkin Dec 14, 2021
491b03a
Update cgroupfs cgroup manager
saschagrunert Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion contrib/test/integration/build/runc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

- name: build runc
make:
params: BUILDTAGS="seccomp selinux"
chdir: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc"

- name: install runc
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies:
match: cri_tools_git_version

- name: runc
version: v1.1.1
version: v1.1.3
refPaths:
- path: scripts/versions
match: runc
Expand Down
42 changes: 10 additions & 32 deletions internal/config/cgmgr/cgroupfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ import (
"strings"

"github.com/containers/common/pkg/cgroups"
"github.com/cri-o/cri-o/internal/config/node"
"github.com/containers/podman/v4/pkg/rootless"
"github.com/cri-o/cri-o/utils"
libctr "github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
libctrCgMgr "github.com/opencontainers/runc/libcontainer/cgroups/manager"
cgcfgs "github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/devices"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -135,46 +132,27 @@ func (*CgroupfsManager) MoveConmonToCgroup(cid, cgroupParent, conmonCgroup strin
}

func setWorkloadSettings(cgPath string, resources *rspec.LinuxResources) (err error) {
var mgr libctr.Manager
if resources.CPU == nil {
return nil
}

paths := map[string]string{
"cpuset": filepath.Join("/sys/fs/cgroup", "cpuset", cgPath),
"cpu": filepath.Join("/sys/fs/cgroup", "cpu", cgPath),
"freezer": filepath.Join("/sys/fs/cgroup", "freezer", cgPath),
"devices": filepath.Join("/sys/fs/cgroup", "devices", cgPath),
}

cg := &cgcfgs.Cgroup{
Name: cgPath,
Resources: &cgcfgs.Resources{},
}
if resources.CPU.Cpus != "" {
cg.Resources.CpusetCpus = resources.CPU.Cpus
Path: "/" + cgPath,
Resources: &cgcfgs.Resources{
SkipDevices: true,
CpusetCpus: resources.CPU.Cpus,
},
Rootless: rootless.IsRootless(),
}
if resources.CPU.Shares != nil {
cg.Resources.CpuShares = *resources.CPU.Shares
}

// We need to white list all devices
// so containers created underneath won't fail
cg.Resources.Devices = []*devices.Rule{
{
Type: devices.WildcardDevice,
Allow: true,
},
}

if node.CgroupIsV2() {
mgr, err = fs2.NewManager(cg, cgPath)
} else {
mgr, err = fs.NewManager(cg, paths)
}
mgr, err := libctrCgMgr.New(cg)
if err != nil {
return err
}

return mgr.Set(cg.Resources)
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ declare -A VERSIONS=(
["cni-plugins"]=v1.1.1
["conmon"]=v2.1.2
["cri-tools"]=v1.24.2
["runc"]=v1.1.1
["runc"]=v1.1.3
["crun"]=1.4.5
["bats"]=v1.6.0
)
Expand Down
78 changes: 78 additions & 0 deletions vendor/github.com/opencontainers/runc/libcontainer/cgroups/manager/new.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,7 @@ github.com/opencontainers/runc/libcontainer/cgroups/ebpf/devicefilter
github.com/opencontainers/runc/libcontainer/cgroups/fs
github.com/opencontainers/runc/libcontainer/cgroups/fs2
github.com/opencontainers/runc/libcontainer/cgroups/fscommon
github.com/opencontainers/runc/libcontainer/cgroups/manager
github.com/opencontainers/runc/libcontainer/cgroups/systemd
github.com/opencontainers/runc/libcontainer/configs
github.com/opencontainers/runc/libcontainer/devices
Expand Down