From ebd63adac22e6fad6f6a3e59ecf4185426a3d6ea Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Nov 2022 09:22:36 +0100 Subject: [PATCH 1/3] integration/client: fix go.mod grouping go.mod doesn't always do a great job on keeping the dependencies grouped in the right block; 2b60770c4b210e769d2fcbeaf25588af9494a822 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 --- integration/client/go.mod | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/integration/client/go.mod b/integration/client/go.mod index ec917c629..5106def40 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -3,14 +3,14 @@ module github.com/containerd/containerd/integration/client go 1.18 require ( + github.com/AdaLogics/go-fuzz-headers v0.0.0-20221118232415-3345c89a7c72 github.com/Microsoft/hcsshim v0.10.0-rc.1 github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 - github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 // indirect + github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 github.com/containerd/containerd v1.6.2 // see replace; the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.1.1-0.20220420014843-944ef4a40df3 github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 - github.com/gogo/protobuf v1.3.2 // indirect github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 @@ -19,15 +19,11 @@ require ( golang.org/x/sys v0.2.0 ) -require ( - github.com/AdaLogics/go-fuzz-headers v0.0.0-20221118232415-3345c89a7c72 - github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 -) - require ( github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221121202950-b2031950a318 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect github.com/cilium/ebpf v0.9.1 // indirect + github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/containerd/fifo v1.0.0 // indirect @@ -39,6 +35,7 @@ require ( github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect + github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.9 // indirect From 3c1c0878e34a46e32fb4df3e20ca58b2cb940b0f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Nov 2022 09:29:03 +0100 Subject: [PATCH 2/3] 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 :) Signed-off-by: Sebastiaan van Stijn --- integration/client/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/client/go.mod b/integration/client/go.mod index 5106def40..6c9066732 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -7,7 +7,7 @@ require ( github.com/Microsoft/hcsshim v0.10.0-rc.1 github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 - github.com/containerd/containerd v1.6.2 // see replace; the actual version of containerd is replaced with the code at the root of this repository + github.com/containerd/containerd v1.7.0-beta.0 // see replace; the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.1.1-0.20220420014843-944ef4a40df3 github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 From 63c6c55ab4d81c50644929465d7914b889dc7177 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Nov 2022 10:00:37 +0100 Subject: [PATCH 3/3] go.mod: roll back github.com/containerd/cgroups to v1.0.4 release This was updated in 470d3ee057de19a1d6cf8f7f94d9d98980d2a08d, 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 --- go.mod | 2 +- go.sum | 4 ++-- integration/client/go.mod | 2 +- integration/client/go.sum | 4 ++-- vendor/modules.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 8f32ed9e6..0e07120bb 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cilium/ebpf v0.9.1 // indirect - github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 // indirect + github.com/containerd/cgroups v1.0.4 // indirect github.com/containers/ocicrypt v1.1.3 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect diff --git a/go.sum b/go.sum index b872ae3bc..e8c3eee43 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4S github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= -github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 h1:qWq0iv560E8jXZKwWipx3Xot0dYPyfKBeDNfRwYth/U= -github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= +github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 h1:Tej/o6wjJ3icV9qkPopNXJxk2oeVAmRc7JL0q5JeUq8= github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= diff --git a/integration/client/go.mod b/integration/client/go.mod index 6c9066732..9a669026a 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -23,7 +23,7 @@ require ( github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221121202950-b2031950a318 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect github.com/cilium/ebpf v0.9.1 // indirect - github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 // indirect + github.com/containerd/cgroups v1.0.4 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/containerd/fifo v1.0.0 // indirect diff --git a/integration/client/go.sum b/integration/client/go.sum index cf8ad911c..cc2446efe 100644 --- a/integration/client/go.sum +++ b/integration/client/go.sum @@ -464,8 +464,8 @@ github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2v github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= -github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 h1:qWq0iv560E8jXZKwWipx3Xot0dYPyfKBeDNfRwYth/U= -github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= +github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 h1:Tej/o6wjJ3icV9qkPopNXJxk2oeVAmRc7JL0q5JeUq8= github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw= github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= diff --git a/vendor/modules.txt b/vendor/modules.txt index f5aab1b3c..5abfacb19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -91,7 +91,7 @@ github.com/containerd/aufs/plugin # github.com/containerd/btrfs v1.0.0 ## explicit; go 1.15 github.com/containerd/btrfs -# github.com/containerd/cgroups v1.0.5-0.20220816231112-7083cd60b721 +# github.com/containerd/cgroups v1.0.4 ## explicit; go 1.17 github.com/containerd/cgroups/stats/v1 # github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774