Skip to content
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

Jump to bottom

libct/cg: make Set accept configs.Resources #2906

Merged
merged 3 commits into from
Apr 30, 2021
Merged

libct/cg: make Set accept configs.Resources #2906

merged 3 commits into from
Apr 30, 2021

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Apr 13, 2021 •
edited
Loading

This is mostly refactoring that lays the foundation for better resource updates.

  1. libct/cg/systemd/v2: fix Set to use resources from the argument.
  2. libct/cg: make Set accept configs.Resources (rather that the whole configs.Cgroups).
  3. libct/cg: allow Set(nil) (to distinguish between set and update).
  4. libc/cg: improve Manager docs.

See individual commits for more details as to why and how.

Proposed changelog entry

@kolyshkin kolyshkin force-pushed the set-allow-nil branch 2 times, most recently from 0fc0cc4 to dc35884 Compare April 13, 2021 22:08
@kolyshkin kolyshkin marked this pull request as ready for review April 14, 2021 00:12
@kolyshkin
Copy link
Contributor Author

This helps to fix Kubernetes/CAdvisor after PR #2814 (see kubernetes/kubernetes#100631), and this is a change in the public API (of a cgroup controller) so I'd like to to go in in rc94.

@kolyshkin kolyshkin added this to the 1.0.0-rc94 milestone Apr 15, 2021
@h-vetinari
Copy link

Typo in 499fb99 msg:

[...] as the method can not change cgroup contfuration configuration [...]

[...] as now Set have has two sets of resources [...]

@kolyshkin
Copy link
Contributor Author

Typo in 499fb99 msg

@h-vetinari thank you, fixed

@kolyshkin
Copy link
Contributor Author

ci hit a snag, restarted

@kolyshkin kolyshkin changed the title libct/cg: allow Set(nil) libct/cg: make Set accept configs.Resources, allow Set(nil) Apr 15, 2021
odinuge
odinuge reviewed Apr 16, 2021
View reviewed changes
Copy link
Contributor

@odinuge odinuge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall positive with the change, just some thoughts when we are rewriting the API.

libcontainer/cgroups/cgroups.go Show resolved Hide resolved
libcontainer/cgroups/fs/fs.go Outdated Show resolved Hide resolved
AkihiroSuda
AkihiroSuda previously approved these changes Apr 20, 2021
View reviewed changes
@cyphar
Copy link
Member

cyphar commented Apr 20, 2021

LGTM, aside from the nit -- though I will admit I'm not sure I quite understand what the need for Set(nil) is (then again, the old behaviour was also kinda weird too -- my guess is it got inherited by the behaviour of runc update where having resources unset leads to them not being set at all).

@AkihiroSuda
Copy link
Member

needs rebase

@kolyshkin kolyshkin force-pushed the set-allow-nil branch 2 times, most recently from ec4714c to e0133d6 Compare April 23, 2021 03:08
@kolyshkin
Copy link
Contributor Author

Rebased.

though I will admit I'm not sure I quite understand what the need for Set(nil) is

Some libcontainer users (notably kubernetes) previously relied on the fact that Apply() sets the parameters (specified during manager creation) -- which was true for systemd before #2814. The idea here is those users who relied on the functionality can call Set(nil) after Apply() to retain the old behavior.

Anyway, maybe this is not necessary -- I will re-check one more time tomorrow.

@tao12345666333 tao12345666333 mentioned this pull request Apr 27, 2021
Closed
@cyphar
Copy link
Member

cyphar commented Apr 28, 2021

@kolyshkin

Anyway, maybe this is not necessary -- I will re-check one more time tomorrow.

Yeah, the reason I asked was that I read through the linked k8s thread and it seems as though k8s doesn't need this (though I could be wrong). But as I said, I don't really mind if we have it -- it will make Set(nil) slightly strange but only direct users of libcontainer would care about it.

@cyphar
Copy link
Member

cyphar commented Apr 28, 2021

With #2923 merged, this needs a rebase.

@kolyshkin
libct/cg/sd/v2: fix Set argument
af0710a 
For some reason, systemd cgroup v2 driver's Set is not using its
container argument when generating systemd unit properties.

This bug is not detected by our update tests as we run a new binary
every time and thus a new instance of a cgroup manager.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
libct/cg: make Set accept configs.Resources
3f65946 
A cgroup manager's Set method sets cgroup resources, but historically
it was accepting configs.Cgroups.

Refactor it to accept resources only. This is an improvement from the
API point of view, as the method can not change cgroup configuration
(such as path to the cgroup etc), it can only set (modify) its
resources/limits.

This also lays the foundation for complicated resource updates, as now
Set has two sets of resources -- the one that was previously specified
during cgroup manager creation (or the previous Set), and the one passed
in the argument, so it could deduce the difference between these. This
is a long term goal though.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
libc/cg: improve Manager docs
abf12ce 
Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin added a commit to kolyshkin/kubernetes that referenced this pull request May 21, 2021
@kolyshkin
vendor: bump runc to rc95
5eea547 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>
ehashman added a commit to ehashman/kubernetes that referenced this pull request May 21, 2021
@ehashman @kolyshkin
UPSTREAM: <drop>: bump(runc)
2721255 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Co-Authored-By: Kir Kolyshkin <[email protected]>
k8s-publishing-bot pushed a commit to kubernetes/code-generator that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
d95c662 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/apimachinery that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
2c210a7 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/api that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
6601f0c 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/client-go that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
a802afb 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/component-base that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
40c61c4 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/component-helpers that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
40be551 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/apiserver that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
aa6a30e 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kube-aggregator that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
8e54d9d 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/sample-apiserver that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
18ee243 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/sample-controller that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
f463884 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/apiextensions-apiserver that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
49cd115 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/metrics that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
6a59e22 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/cli-runtime that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
c822c35 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/sample-cli-plugin that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
35bf077 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kube-proxy that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
d950187 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kubelet that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
f38369e 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kube-scheduler that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
a8dd487 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/controller-manager that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
6f250ca 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/cloud-provider that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
4a3a012 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kube-controller-manager that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
4c06235 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/cluster-bootstrap that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
23a602c 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/csi-translation-lib that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
1f80933 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/legacy-cloud-providers that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
60738cd 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/cri-api that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
15afe7e 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
k8s-publishing-bot pushed a commit to kubernetes/kubectl that referenced this pull request May 22, 2021
@kolyshkin @k8s-publishing-bot
vendor: bump runc to rc95
e36a7f9 
runc rc95 contains a fix for CVE-2021-30465.

runc rc94 provides fixes and improvements.

One notable change is cgroup manager's Set now accept Resources rather
than Cgroup (see opencontainers/runc#2906).
Modify the code accordingly.

Also update runc dependencies (as hinted by hack/lint-depdendencies.sh):

        github.com/cilium/ebpf v0.5.0
        github.com/containerd/console v1.0.2
        github.com/coreos/go-systemd/v22 v22.3.1
        github.com/godbus/dbus/v5 v5.0.4
        github.com/moby/sys/mountinfo v0.4.1
        golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
        github.com/google/go-cmp v0.5.4
        github.com/kr/pretty v0.2.1
        github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417

Signed-off-by: Kir Kolyshkin <[email protected]>

Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@odinuge odinuge odinuge left review comments

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@cyphar cyphar cyphar approved these changes

Assignees
No one assigned
Labels
area/go-api libcontainer Go API impact/changelog kind/refactor refactoring
Projects
None yet
Milestone
1.0.0-rc94
Development

Successfully merging this pull request may close these issues.
5 participants
@kolyshkin @h-vetinari @cyphar @AkihiroSuda @odinuge