Skip to content

Commit 165ca97

Browse files
hjiaweihjiawei
authored
Update Go dependencies Mar. 2025 (#9998)
* Update Go dependencies Mar. 2025 This changeset updates Go dependencies to fix bugs and reduce CVEs. * Update Ubuntu base image for Felix FVs
1 parent 756c80b commit 165ca97

File tree

11 files changed

+413
-418
lines changed

11 files changed

+413
-418
lines changed

‎.semaphore/vms/create-test-vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function create-vm() {
2929
gcloud --quiet compute instances create "${vm_name}" \
3030
--zone=${zone} \
3131
--machine-type=n4-standard-4 \
32-
--image=ubuntu-2004-focal-v20241115 \
32+
--image=ubuntu-2004-focal-v20250313 \
3333
--image-project=ubuntu-os-cloud \
3434
--boot-disk-size=$disk_size \
3535
--boot-disk-type=hyperdisk-balanced && \

‎api/go.mod

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/projectcalico/api
22

3-
go 1.23.6
3+
go 1.23.7
44

55
require (
66
github.com/jinzhu/copier v0.4.0
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.35.1
9-
k8s.io/api v0.32.2
10-
k8s.io/apimachinery v0.32.2
11-
k8s.io/client-go v0.32.2
8+
github.com/onsi/gomega v1.36.2
9+
k8s.io/api v0.32.3
10+
k8s.io/apimachinery v0.32.3
11+
k8s.io/client-go v0.32.3
1212
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
1313
)
1414

@@ -43,7 +43,7 @@ require (
4343
golang.org/x/term v0.27.0 // indirect
4444
golang.org/x/text v0.21.0 // indirect
4545
golang.org/x/time v0.7.0 // indirect
46-
google.golang.org/protobuf v1.35.1 // indirect
46+
google.golang.org/protobuf v1.36.1 // indirect
4747
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4848
gopkg.in/inf.v0 v0.9.1 // indirect
4949
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
@@ -56,29 +56,29 @@ require (
5656
)
5757

5858
replace (
59-
k8s.io/api => k8s.io/api v0.32.2
60-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
61-
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
62-
k8s.io/apiserver => k8s.io/apiserver v0.32.2
63-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
64-
k8s.io/client-go => k8s.io/client-go v0.32.2
65-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2
66-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2
67-
k8s.io/code-generator => k8s.io/code-generator v0.32.2
68-
k8s.io/component-base => k8s.io/component-base v0.32.2
69-
k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
70-
k8s.io/controller-manager => k8s.io/controller-manager v0.32.2
71-
k8s.io/cri-api => k8s.io/cri-api v0.32.2
72-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
73-
k8s.io/externaljwt => k8s.io/externaljwt v0.32.2
74-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2
75-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2
76-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2
77-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
78-
k8s.io/kubectl => k8s.io/kubectl v0.32.2
79-
k8s.io/kubelet => k8s.io/kubelet v0.32.2
80-
k8s.io/metrics => k8s.io/metrics v0.32.2
81-
k8s.io/mount-utils => k8s.io/mount-utils v0.32.2
82-
k8s.io/node-api => k8s.io/node-api v0.32.2
83-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2
59+
k8s.io/api => k8s.io/api v0.32.3
60+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.3
61+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
62+
k8s.io/apiserver => k8s.io/apiserver v0.32.3
63+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.3
64+
k8s.io/client-go => k8s.io/client-go v0.32.3
65+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.3
66+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.3
67+
k8s.io/code-generator => k8s.io/code-generator v0.32.3
68+
k8s.io/component-base => k8s.io/component-base v0.32.3
69+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.3
70+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.3
71+
k8s.io/cri-api => k8s.io/cri-api v0.32.3
72+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.3
73+
k8s.io/externaljwt => k8s.io/externaljwt v0.32.3
74+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.3
75+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.3
76+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.3
77+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.3
78+
k8s.io/kubectl => k8s.io/kubectl v0.32.3
79+
k8s.io/kubelet => k8s.io/kubelet v0.32.3
80+
k8s.io/metrics => k8s.io/metrics v0.32.3
81+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.3
82+
k8s.io/node-api => k8s.io/node-api v0.32.3
83+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.3
8484
)

‎api/go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
4646
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4747
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4848
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
49-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
50-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
49+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
50+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
5151
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5252
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5353
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -82,12 +82,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
8282
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
8383
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
8484
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
85-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
86-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
85+
github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM=
86+
github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM=
8787
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
8888
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
89-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
90-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
89+
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
90+
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
9191
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
9292
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
9393
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -154,8 +154,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
154154
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
155155
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
156156
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
157-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
158-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
157+
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
158+
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
159159
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
160160
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
161161
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -166,8 +166,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
166166
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
167167
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
168168
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
169-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
170-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
169+
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
170+
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
171171
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
172172
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
173173
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -184,12 +184,12 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
184184
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
185185
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
186186
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
187-
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
188-
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
189-
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
190-
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
191-
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
192-
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
187+
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
188+
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
189+
k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
190+
k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
191+
k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU=
192+
k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY=
193193
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
194194
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
195195
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

‎felix/.semaphore/create-test-vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function create-vm() {
2828
gcloud --quiet compute instances create "${vm_name}" \
2929
--zone=${zone} \
3030
--machine-type=n4-standard-4 \
31-
--image=ubuntu-2204-jammy-v20241119 \
31+
--image=ubuntu-2204-jammy-v20250312 \
3232
--image-project=ubuntu-os-cloud \
3333
--boot-disk-size=20GB \
3434
--boot-disk-type=hyperdisk-balanced && \

0 commit comments

Comments
 (0)