Skip to content

Commit 104ef4d

Browse files
ncopatwz123
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> Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit e22d28c)
1 parent e8eaacf commit 104ef4d

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
@@ -45,7 +45,7 @@ require (
4545
github.com/urfave/cli v1.22.2
4646
github.com/vishvananda/netlink v1.1.0
4747
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
48-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188
48+
github.com/weaveworks/footloose v0.0.0-20210208164054-2862489574a3
4949
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
5050
github.com/zcalusic/sysinfo v0.0.0-20210226105846-b810d137e525
5151
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
@@ -94,6 +94,8 @@ replace (
9494
github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
9595
github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.1
9696

97+
github.com/weaveworks/footloose => github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890
98+
9799
// make sure we don't have CVE-2020-28852
98100
golang.org/x/text => golang.org/x/text v0.3.6
99101
google.golang.org/grpc => google.golang.org/grpc v1.27.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE
687687
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
688688
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
689689
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
690+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890 h1:36ZxVGR5mGZSqpsNsvMjhcjycwH/TQIQN8G25gimNuU=
691+
github.com/ncopa/footloose v0.0.0-20220210144732-fe970537b890/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
690692
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
691693
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
692694
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -909,8 +911,6 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp
909911
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
910912
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
911913
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
912-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188 h1:BuiVM+91YRjWUSMvF93A7Sm7s7IHrxjrPcc/5boO2V0=
913-
github.com/weaveworks/footloose v0.0.0-20200609124411-8f3df89ea188/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc=
914914
github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
915915
github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU=
916916
github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=

0 commit comments

Comments
 (0)