Skip to content

Commit af6d331

Browse files
authored
deps: migrate github.com/osrg/gobgp/v3 to github.com/osrg/gobgp/v4 (#5990)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 8fe8096 commit af6d331

File tree

10 files changed

+234
-291
lines changed

10 files changed

+234
-291
lines changed

.github/workflows/build-arm64-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ jobs:
117117
echo "COPY $bin /$f" >> "$dockerfile"
118118
;;
119119
gobgp)
120-
version=`go list -m -f '{{.Version}}' github.com/osrg/gobgp/v3`
120+
version=`go list -m -f '{{.Version}}' github.com/osrg/gobgp/v4`
121121
echo "Building $bin@$version from source..."
122-
$GO_INSTALL github.com/osrg/gobgp/v3/cmd/$bin
122+
$GO_INSTALL github.com/osrg/gobgp/v4/cmd/$bin
123123
echo "COPY $bin /$f" >> "$dockerfile"
124124
;;
125125
*)

.github/workflows/build-x86-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ jobs:
290290
echo "COPY $bin /$f" >> "$dockerfile"
291291
;;
292292
gobgp)
293-
version=`go list -m -f '{{.Version}}' github.com/osrg/gobgp/v3`
293+
version=`go list -m -f '{{.Version}}' github.com/osrg/gobgp/v4`
294294
echo "Building $bin@$version from source..."
295-
$GO_INSTALL github.com/osrg/gobgp/v3/cmd/$bin
295+
$GO_INSTALL github.com/osrg/gobgp/v4/cmd/$bin
296296
echo "COPY $bin /$f" >> "$dockerfile"
297297
;;
298298
*)

dist/images/go-deps/download-go-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
ARCH=${ARCH:-amd64}
66
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.8.0}
7-
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.34.1}
7+
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.34.2}
88
GOBGP_VERSION=${GOBGP_VERSION:-4.1.0}
99

1010

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/moby/sys/mountinfo v0.7.2
3838
github.com/onsi/ginkgo/v2 v2.27.2
3939
github.com/onsi/gomega v1.38.2
40-
github.com/osrg/gobgp/v3 v3.37.0
40+
github.com/osrg/gobgp/v4 v4.1.0
4141
github.com/ovn-kubernetes/libovsdb v0.8.1
4242
github.com/parnurzeal/gorequest v0.3.0
4343
github.com/prometheus-community/pro-bing v0.7.0
@@ -57,7 +57,6 @@ require (
5757
golang.org/x/time v0.14.0
5858
golang.org/x/tools v0.39.0
5959
google.golang.org/grpc v1.77.0
60-
google.golang.org/protobuf v1.36.10
6160
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.2.3
6261
k8s.io/api v0.34.2
6362
k8s.io/apiextensions-apiserver v0.34.2
@@ -202,6 +201,7 @@ require (
202201
github.com/openshift/api v0.0.0 // indirect
203202
github.com/openshift/client-go v3.9.0+incompatible // indirect
204203
github.com/openshift/custom-resource-status v1.1.2 // indirect
204+
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
205205
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
206206
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
207207
github.com/pkg/errors v0.9.1 // indirect
@@ -215,6 +215,7 @@ require (
215215
github.com/prometheus/procfs v0.19.2 // indirect
216216
github.com/russross/blackfriday/v2 v2.1.0 // indirect
217217
github.com/sagikazarmark/locafero v0.12.0 // indirect
218+
github.com/segmentio/fasthash v1.0.3 // indirect
218219
github.com/smartystreets/goconvey v1.8.1 // indirect
219220
github.com/spf13/afero v1.15.0 // indirect
220221
github.com/spf13/cast v1.10.0 // indirect
@@ -254,6 +255,7 @@ require (
254255
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
255256
google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846 // indirect
256257
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
258+
google.golang.org/protobuf v1.36.10 // indirect
257259
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
258260
gopkg.in/inf.v0 v0.9.1 // indirect
259261
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

go.sum

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78
246246
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
247247
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
248248
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
249-
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
250-
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
249+
github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
250+
github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
251251
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
252252
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
253253
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
@@ -563,9 +563,11 @@ github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47 h1:+TEY29DK0Xh
563563
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NRAjtYVAKokiI9LouzTv4mhds8P4S1TwdVAfbjKSk=
564564
github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
565565
github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
566+
github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
567+
github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
566568
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
567-
github.com/osrg/gobgp/v3 v3.37.0 h1:+ObuOdvj7G7nxrT0fKFta+EAupdWf/q1WzbXydr8IOY=
568-
github.com/osrg/gobgp/v3 v3.37.0/go.mod h1:kVHVFy1/fyZHJ8P32+ctvPeJogn9qKwa1YCeMRXXrP0=
569+
github.com/osrg/gobgp/v4 v4.1.0 h1:f9wjTna4puPy80USuvoM4yquv29SzPra5u+bQtWfris=
570+
github.com/osrg/gobgp/v4 v4.1.0/go.mod h1:1a0YiXMuyRPqcCX+fkXZ2UUtcOnUxAWynFunUOSZepk=
569571
github.com/parnurzeal/gorequest v0.3.0 h1:SoFyqCDC9COr1xuS6VA8fC8RU7XyrJZN2ona1kEX7FI=
570572
github.com/parnurzeal/gorequest v0.3.0/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
571573
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
@@ -610,6 +612,8 @@ github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88ee
610612
github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
611613
github.com/scylladb/go-set v1.0.2 h1:SkvlMCKhP0wyyct6j+0IHJkBkSZL+TDzZ4E7f7BCcRE=
612614
github.com/scylladb/go-set v1.0.2/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
615+
github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM=
616+
github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
613617
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
614618
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
615619
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

0 commit comments

Comments
 (0)