integration/client: fix go.mod grouping, containerd to v1.7.0-beta.0, cgroups back to v1.0.4#7720
Merged
fuweid merged 3 commits intocontainerd:mainfrom Nov 27, 2022
Merged
Conversation
go.mod doesn't always do a great job on keeping the dependencies grouped in the right block; 2b60770 added an extra "require" block, after which things went downward. This patch is grouping them back in the right block to nudge it in the right direction. Signed-off-by: Sebastiaan van Stijn <[email protected]>
While the version isn't used (as it's replaced), let's keep it somewhat in line with reality :) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This was updated in 470d3ee, but we only needed the ebpf update. As nothing depends on this module anymore, other than for the stats package (which didn't change in between), we can (for now) roll it back to v1.0.4, and just force the newer ebpf package. Things rolled back (doesn't affect vendored code); https://github.com/containerd/cgroups/compare/7083cd60b721..v1.0.4 Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
changed the title
Merged
dcantah
approved these changes
Nov 27, 2022
fuweid
approved these changes
Nov 27, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
integration/client: fix go.mod grouping
go.mod doesn't always do a great job on keeping the dependencies grouped in the
right block; 2b60770 added an extra "require"
block, after which things went downward.
This patch is grouping them back in the right block to nudge it in the right
direction.
integration/client: update containerd version to v1.7.0-beta.0
While the version isn't used (as it's replaced), let's keep it somewhat
in line with reality :)
go.mod: roll back github.com/containerd/cgroups to v1.0.4 release
This was updated in 470d3ee, but we
only needed the ebpf update. As nothing depends on this module anymore,
other than for the stats package (which didn't change in between), we
can (for now) roll it back to v1.0.4, and just force the newer ebpf
package.
Things rolled back (doesn't affect vendored code);
https://github.com/containerd/cgroups/compare/7083cd60b721..v1.0.4