Skip to content

Commit eaaa04f

Browse files
committed
Avoid netlink 1.2.1 until out of beta
1 parent f3f1aa3 commit eaaa04f

File tree

2 files changed

+237
-64
lines changed

2 files changed

+237
-64
lines changed

go.mod

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ require (
4949
gotest.tools/v3 v3.5.0
5050
)
5151

52+
require github.com/vishvananda/netlink v1.2.1-beta.2
53+
5254
require (
5355
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
5456
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -80,23 +82,19 @@ require (
8082
github.com/docker/docker-credential-helpers v0.7.0 // indirect
8183
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
8284
github.com/docker/go-metrics v0.0.1 // indirect
83-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
8485
github.com/felixge/httpsnoop v1.0.3 // indirect
8586
github.com/fvbommel/sortorder v1.0.2 // indirect
8687
github.com/go-logr/logr v1.2.4 // indirect
8788
github.com/go-logr/stdr v1.2.2 // indirect
88-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
89-
github.com/go-openapi/jsonreference v0.20.0 // indirect
90-
github.com/go-openapi/swag v0.19.14 // indirect
9189
github.com/gofrs/flock v0.8.1 // indirect
9290
github.com/gofrs/uuid v4.2.0+incompatible // indirect
9391
github.com/gogo/googleapis v1.4.1 // indirect
9492
github.com/gogo/protobuf v1.3.2 // indirect
9593
github.com/golang/protobuf v1.5.3 // indirect
96-
github.com/google/gnostic v0.5.7-v3refs // indirect
9794
github.com/google/go-cmp v0.5.9 // indirect
9895
github.com/google/gofuzz v1.2.0 // indirect
9996
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
97+
github.com/googleapis/gnostic v0.5.5 // indirect
10098
github.com/gorilla/mux v1.8.0 // indirect
10199
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
102100
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
@@ -109,13 +107,11 @@ require (
109107
github.com/in-toto/in-toto-golang v0.5.0 // indirect
110108
github.com/inconshreveable/mousetrap v1.1.0 // indirect
111109
github.com/jinzhu/gorm v1.9.11 // indirect
112-
github.com/josharian/intern v1.0.0 // indirect
113110
github.com/json-iterator/go v1.1.12 // indirect
114111
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
115112
github.com/klauspost/compress v1.16.5 // indirect
116113
github.com/kr/pretty v0.3.0 // indirect
117114
github.com/magiconair/properties v1.8.6 // indirect
118-
github.com/mailru/easyjson v0.7.6 // indirect
119115
github.com/mattn/go-colorable v0.1.13 // indirect
120116
github.com/mattn/go-isatty v0.0.17 // indirect
121117
github.com/mattn/go-runewidth v0.0.14 // indirect
@@ -130,7 +126,6 @@ require (
130126
github.com/moby/sys/symlink v0.2.0 // indirect
131127
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
132128
github.com/modern-go/reflect2 v1.0.2 // indirect
133-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
134129
github.com/opencontainers/runc v1.1.7 // indirect
135130
github.com/pelletier/go-toml v1.9.5 // indirect
136131
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
@@ -150,6 +145,7 @@ require (
150145
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
151146
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
152147
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
148+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
153149
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
154150
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
155151
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -181,21 +177,19 @@ require (
181177
k8s.io/apimachinery v0.26.2 // indirect
182178
k8s.io/client-go v0.26.2 // indirect
183179
k8s.io/klog/v2 v2.90.1 // indirect
184-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
185180
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
186-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
187181
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
188182
sigs.k8s.io/yaml v1.3.0 // indirect
189183
)
190184

191-
require github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
192-
193-
require github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
194-
195185
replace (
196186
// Override for e2e tests
197187
github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7
198188

189+
// v1.2.1-beta.2 is the latest version, override to use v1.1.0 to avoid beta
190+
// https://github.com/vishvananda/netlink/compare/v1.1.0...v1.2.1-beta.2
191+
github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
192+
199193
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
200194

201195
// For k8s dependencies, we use a replace directive, to prevent them being

0 commit comments

Comments
 (0)