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.

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

[20.10] vendor: update github.com/containerd/cgroups and github.com/cilium/ebpf (for fixing empty docker stats) #43567

Merged
merged 1 commit into from May 10, 2022

Conversation

42wim
Copy link

@42wim 42wim commented May 7, 2022

Fixes
- docker/for-linux#1284
- containerd/containerd#6700
- moby#43387

Update to cgroups v1.0.1 which has the current proto for cgroupsv1
Need to update cilium/ebpf dependency to v0.4.0

Signed-off-by: Wim <wim@42.be>
@thaJeztah thaJeztah changed the title vendor: update github.com/containerd/cgroups and github.com/cilium/ebpf [20.10] vendor: update github.com/containerd/cgroups and github.com/cilium/ebpf May 9, 2022
@thaJeztah thaJeztah added this to the 20.10.16 milestone May 9, 2022
@@ -135,13 +135,13 @@ google.golang.org/genproto 3f1135a288c9a07e340ae8ba4cc6
github.com/containerd/containerd 7cfa023d95d37076d5ab035003d4839f4b6ba791 https://github.com/moby/containerd.git # master (v1.5.0-dev) + patch for CVE-2021-41190 and CVE-2022-24769
github.com/containerd/fifo 0724c46b320cf96bb172a0550c19a4b1fca4dacb
github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
github.com/containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510
github.com/containerd/cgroups b9de8a2212026c07cec67baf3323f1fc0121e048 # v1.0.1
Copy link
Member

@cpuguy83 cpuguy83 May 9, 2022

Choose a reason for hiding this comment

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

Curious why you didn't bring in 1.0.3?

Copy link
Member

@thaJeztah thaJeztah May 9, 2022

Choose a reason for hiding this comment

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

I guess "smaller diff" (but haven't looked how large the diff would be with 1.0.3)

Copy link
Author

@42wim 42wim May 9, 2022

Choose a reason for hiding this comment

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

Yes, less dependencies and the only change needed was the protobuf fix in v1.0.1

@cpuguy83 cpuguy83 requested a review from AkihiroSuda May 9, 2022
Copy link
Member

@cpuguy83 cpuguy83 left a comment

LGTM

Nice catch for this.

@AkihiroSuda AkihiroSuda changed the title [20.10] vendor: update github.com/containerd/cgroups and github.com/cilium/ebpf [20.10] vendor: update github.com/containerd/cgroups and github.com/cilium/ebpf (for fixing empty docker stats) May 9, 2022
Copy link
Member

@thaJeztah thaJeztah left a comment

LGTM, thanks!

@thaJeztah thaJeztah merged commit 462cd7d into moby:20.10 May 10, 2022
2 checks passed
@42wim 42wim deleted the fixstats branch May 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants