Skip to content

Commit 31fc405

Browse files
committed
Use footloose fork to fix use ov cgroupv2 for inttests
Currently footloose only works with cgroup v1. Use fork for now til this has be resolved upstream. Upstream issue: weaveworks/footloose#270 Upstream PR: weaveworks/footloose#272 Signed-off-by: Natanael Copa <ncopa@mirantis.com>
1 parent 74553f8 commit 31fc405

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/urfave/cli v1.22.4
4040
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
4141
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
42-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188
42+
github.com/weaveworks/footloose v0.0.0-20210208164054-2862489574a3
4343
github.com/zcalusic/sysinfo v0.0.0-20210905121133-6fa2f969a900
4444
go.etcd.io/etcd/api/v3 v3.5.1
4545
go.etcd.io/etcd/client/pkg/v3 v3.5.1
@@ -77,6 +77,8 @@ replace (
7777
github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible
7878
github.com/docker/docker => github.com/docker/docker v20.10.2+incompatible
7979

80+
github.com/weaveworks/footloose => github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890
81+
8082
// make sure we don't have CVE-2020-28852
8183
golang.org/x/text => golang.org/x/text v0.3.6
8284
)

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
845845
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
846846
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
847847
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
848+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890 h1:36ZxVGR5mGZSqpsNsvMjhcjycwH/TQIQN8G25gimNuU=
849+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
848850
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
849851
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
850852
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
@@ -1078,8 +1080,6 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17
10781080
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
10791081
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
10801082
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
1081-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188 h1:BuiVM+91YRjWUSMvF93A7Sm7s7IHrxjrPcc/5boO2V0=
1082-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
10831083
github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
10841084
github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU=
10851085
github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=

0 commit comments

Comments
 (0)