Skip to content

Commit 3a38c19

Browse files
committed
update go dependencies and golang version to fix CVE-2024-24790,CVE-2024-24789
1 parent 2781134 commit 3a38c19

File tree

493 files changed

+156445
-74220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

493 files changed

+156445
-74220
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.20.12 as builder
15+
FROM --platform=$BUILDPLATFORM golang:1.21.13 as builder
1616

1717
ARG STAGINGVERSION
1818
ARG TARGETPLATFORM
@@ -22,7 +22,7 @@ ADD . .
2222
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
2323

2424
# Start from Kubernetes Debian base.
25-
FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.5 as debian
25+
FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.13 as debian
2626
# Install necessary dependencies
2727
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
2828
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash

go.mod

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ go 1.20
44

55
require (
66
cloud.google.com/go/compute/metadata v0.2.3
7-
cloud.google.com/go/kms v1.12.1
7+
cloud.google.com/go/kms v1.15.7
88
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0
99
github.com/container-storage-interface/spec v1.6.0
10-
github.com/google/go-cmp v0.5.9
11-
github.com/google/uuid v1.3.0
10+
github.com/google/go-cmp v0.6.0
11+
github.com/google/uuid v1.6.0
12+
github.com/googleapis/gax-go/v2 v2.12.2
1213
github.com/kubernetes-csi/csi-proxy/client v1.1.1
1314
github.com/kubernetes-csi/csi-test/v4 v4.4.0
1415
github.com/onsi/ginkgo/v2 v2.7.1
1516
github.com/onsi/gomega v1.25.0
16-
golang.org/x/oauth2 v0.10.0
17-
golang.org/x/sys v0.19.0
18-
google.golang.org/api v0.134.0
19-
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130
20-
google.golang.org/grpc v1.56.3
17+
golang.org/x/oauth2 v0.18.0
18+
golang.org/x/sys v0.21.0
19+
google.golang.org/api v0.169.0
20+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
21+
google.golang.org/grpc v1.64.1
2122
google.golang.org/protobuf v1.33.0
2223
gopkg.in/gcfg.v1 v1.2.3
2324
k8s.io/api v0.24.1
@@ -32,18 +33,20 @@ require (
3233
)
3334

3435
require (
35-
cloud.google.com/go/compute v1.20.1 // indirect
36-
cloud.google.com/go/iam v1.1.0 // indirect
36+
cloud.google.com/go/compute v1.25.1 // indirect
37+
cloud.google.com/go/iam v1.1.6 // indirect
3738
github.com/Microsoft/go-winio v0.4.17 // indirect
3839
github.com/PuerkitoBio/purell v1.1.1 // indirect
3940
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4041
github.com/beorn7/perks v1.0.1 // indirect
4142
github.com/blang/semver/v4 v4.0.0 // indirect
4243
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4344
github.com/davecgh/go-spew v1.1.1 // indirect
44-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
45+
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
46+
github.com/felixge/httpsnoop v1.0.4 // indirect
4547
github.com/fsnotify/fsnotify v1.5.4 // indirect
46-
github.com/go-logr/logr v1.2.3 // indirect
48+
github.com/go-logr/logr v1.4.1 // indirect
49+
github.com/go-logr/stdr v1.2.2 // indirect
4750
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4851
github.com/go-openapi/jsonreference v0.19.6 // indirect
4952
github.com/go-openapi/swag v0.21.1 // indirect
@@ -52,9 +55,8 @@ require (
5255
github.com/golang/protobuf v1.5.4 // indirect
5356
github.com/google/gnostic v0.5.7-v3refs // indirect
5457
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
55-
github.com/google/s2a-go v0.1.4 // indirect
56-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
57-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
58+
github.com/google/s2a-go v0.1.7 // indirect
59+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
5860
github.com/hashicorp/errwrap v1.0.0 // indirect
5961
github.com/hashicorp/go-multierror v1.1.0 // indirect
6062
github.com/imdario/mergo v0.3.12 // indirect
@@ -76,15 +78,21 @@ require (
7678
github.com/sirupsen/logrus v1.8.1 // indirect
7779
github.com/spf13/pflag v1.0.5 // indirect
7880
go.opencensus.io v0.24.0 // indirect
81+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
82+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
83+
go.opentelemetry.io/otel v1.24.0 // indirect
84+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
7986
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
80-
golang.org/x/crypto v0.22.0 // indirect
81-
golang.org/x/net v0.24.0 // indirect
82-
golang.org/x/term v0.19.0 // indirect
83-
golang.org/x/text v0.14.0 // indirect
84-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
85-
google.golang.org/appengine v1.6.7 // indirect
86-
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
87-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect
87+
golang.org/x/crypto v0.24.0 // indirect
88+
golang.org/x/net v0.26.0 // indirect
89+
golang.org/x/sync v0.7.0 // indirect
90+
golang.org/x/term v0.21.0 // indirect
91+
golang.org/x/text v0.16.0 // indirect
92+
golang.org/x/time v0.5.0 // indirect
93+
google.golang.org/appengine v1.6.8 // indirect
94+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
8896
gopkg.in/inf.v0 v0.9.1 // indirect
8997
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9098
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)