Skip to content

Commit e22d28c

Browse files
ncopajnummelin
authored andcommitted
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 5ef9718 commit e22d28c

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
@@ -38,7 +38,7 @@ require (
3838
github.com/urfave/cli v1.22.4
3939
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
4040
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
41-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188
41+
github.com/weaveworks/footloose v0.0.0-20210208164054-2862489574a3
4242
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
4343
github.com/zcalusic/sysinfo v0.0.0-20210905121133-6fa2f969a900
4444
go.etcd.io/etcd/api/v3 v3.5.4
@@ -76,6 +76,8 @@ replace (
7676
github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible
7777
github.com/docker/docker => github.com/docker/docker v20.10.2+incompatible
7878

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

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
836836
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
837837
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
838838
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
839+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890 h1:36ZxVGR5mGZSqpsNsvMjhcjycwH/TQIQN8G25gimNuU=
840+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
839841
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
840842
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
841843
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
@@ -1080,8 +1082,6 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17
10801082
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
10811083
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
10821084
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
1083-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188 h1:BuiVM+91YRjWUSMvF93A7Sm7s7IHrxjrPcc/5boO2V0=
1084-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
10851085
github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
10861086
github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU=
10871087
github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=

0 commit comments

Comments
 (0)