Skip to content

Commit fe1b09b

Browse files
committed
Avoid netlink 1.2.1 until out of beta
1 parent c161822 commit fe1b09b

File tree

2 files changed

+301
-69
lines changed

2 files changed

+301
-69
lines changed

go.mod

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ require (
5151
gotest.tools/v3 v3.5.1
5252
)
5353

54+
require github.com/vishvananda/netlink v1.2.1-beta.2
55+
5456
require (
5557
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5658
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -78,21 +80,18 @@ require (
7880
github.com/docker/docker-credential-helpers v0.7.0 // indirect
7981
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
8082
github.com/docker/go-metrics v0.0.1 // indirect
81-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
8283
github.com/felixge/httpsnoop v1.0.3 // indirect
8384
github.com/fvbommel/sortorder v1.0.2 // indirect
8485
github.com/go-logr/logr v1.2.4 // indirect
8586
github.com/go-logr/stdr v1.2.2 // indirect
86-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
87-
github.com/go-openapi/jsonreference v0.20.0 // indirect
88-
github.com/go-openapi/swag v0.19.14 // indirect
87+
github.com/go-sql-driver/mysql v1.4.1 // indirect
8988
github.com/gofrs/flock v0.8.1 // indirect
9089
github.com/gogo/googleapis v1.4.1 // indirect
9190
github.com/gogo/protobuf v1.3.2 // indirect
9291
github.com/golang/protobuf v1.5.3 // indirect
93-
github.com/google/gnostic v0.5.7-v3refs // indirect
9492
github.com/google/gofuzz v1.2.0 // indirect
9593
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
94+
github.com/googleapis/gnostic v0.5.5 // indirect
9695
github.com/gorilla/mux v1.8.0 // indirect
9796
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
9897
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
@@ -101,11 +100,12 @@ require (
101100
github.com/imdario/mergo v0.3.16 // indirect
102101
github.com/in-toto/in-toto-golang v0.5.0 // indirect
103102
github.com/inconshreveable/mousetrap v1.1.0 // indirect
104-
github.com/josharian/intern v1.0.0 // indirect
103+
github.com/jinzhu/gorm v1.9.11 // indirect
105104
github.com/json-iterator/go v1.1.12 // indirect
106105
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
107106
github.com/klauspost/compress v1.16.5 // indirect
108-
github.com/mailru/easyjson v0.7.6 // indirect
107+
github.com/kr/pretty v0.3.0 // indirect
108+
github.com/magiconair/properties v1.8.6 // indirect
109109
github.com/mattn/go-colorable v0.1.13 // indirect
110110
github.com/mattn/go-isatty v0.0.17 // indirect
111111
github.com/mattn/go-runewidth v0.0.14 // indirect
@@ -120,7 +120,6 @@ require (
120120
github.com/moby/sys/symlink v0.2.0 // indirect
121121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
122122
github.com/modern-go/reflect2 v1.0.2 // indirect
123-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
124123
github.com/opencontainers/runc v1.1.9 // indirect
125124
github.com/pelletier/go-toml v1.9.5 // indirect
126125
github.com/pkg/errors v0.9.1 // indirect
@@ -136,6 +135,7 @@ require (
136135
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
137136
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
138137
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
138+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
139139
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
140140
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
141141
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -166,21 +166,19 @@ require (
166166
k8s.io/apimachinery v0.26.7 // indirect
167167
k8s.io/client-go v0.26.7 // indirect
168168
k8s.io/klog/v2 v2.90.1 // indirect
169-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
170169
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
171-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
172170
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
173171
sigs.k8s.io/yaml v1.3.0 // indirect
174172
)
175173

176-
require github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
177-
178-
require github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
179-
180174
replace (
181175
// Override for e2e tests
182176
github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7
183177

178+
// v1.2.1-beta.2 is the latest version, override to use v1.1.0 to avoid beta
179+
// https://github.com/vishvananda/netlink/compare/v1.1.0...v1.2.1-beta.2
180+
github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
181+
184182
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
185183

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

0 commit comments

Comments
 (0)