Skip to content

Commit 7dae31c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2790 from ConnorJC3/dep-bump-1125
Bump dependencies for release v1.53.0
2 parents 68213ec + 8c91bf7 commit 7dae31c

File tree

30 files changed

+342
-339
lines changed

30 files changed

+342
-339
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019 The Kubernetes Authors.
1+
# Copyright 2025 The Kubernetes Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,10 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# See
16-
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
17-
# for info on BUILDPLATFORM, TARGETOS, TARGETARCH, etc.
18-
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25@sha256:6bac879c5b77e0fc9c556a5ed8920e89dab1709bd510a854903509c828f67f96 AS builder
15+
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.25@sha256:e68f6a00e88586577fafa4d9cefad1349c2be70d21244321321c407474ff9bf2 AS builder
1916
WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
2017
RUN go env -w GOCACHE=/gocache GOMODCACHE=/gomodcache
2118
COPY go.* .
@@ -28,11 +25,11 @@ ARG VERSION
2825
ARG GOEXPERIMENT
2926
RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache OS=$TARGETOS ARCH=$TARGETARCH make
3027

31-
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al23@sha256:cc8243a719217c06acfb957fe8dd05eb26957d48d5b52e9a073170722a10c498 AS linux-al2023
28+
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al23@sha256:30b2c869eb875119864277ecf854d6ee8b1d777cc596e5fadfbe162e2ca1ec92 AS linux-al2023
3229
COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
3330
ENTRYPOINT ["/bin/aws-ebs-csi-driver"]
3431

35-
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al2@sha256:78017dc239f8b948676d84ea3a06d9b4fda32de1c518d5ad38fd907841ba99c3 AS linux-al2
32+
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al2@sha256:1c6fc8e4810d495f9ca3722b81d922785eb509cffed802fd4228874fef3b63bb AS linux-al2
3633
COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
3734
ENTRYPOINT ["/bin/aws-ebs-csi-driver"]
3835

‎cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 5400s
1616
steps:
17-
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250513-9264efb079
17+
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20251110-7ccd542560
1818
entrypoint: ./hack/cloudbuild.sh
1919
env:
2020
- GIT_TAG=${_GIT_TAG}

‎cmd/hooks/prestop.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func waitForVolumeAttachments(clientset kubernetes.Interface, nodeName string) e
104104
informer := factory.Storage().V1().VolumeAttachments().Informer()
105105

106106
_, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
107-
DeleteFunc: func(obj interface{}) {
107+
DeleteFunc: func(obj any) {
108108
klog.V(5).InfoS("DeleteFunc: VolumeAttachment deleted", "node", nodeName)
109109
va, ok := obj.(*storagev1.VolumeAttachment)
110110
if !ok {
@@ -116,7 +116,7 @@ func waitForVolumeAttachments(clientset kubernetes.Interface, nodeName string) e
116116
}
117117
}
118118
},
119-
UpdateFunc: func(oldObj, newObj interface{}) {
119+
UpdateFunc: func(oldObj, newObj any) {
120120
klog.V(5).InfoS("UpdateFunc: VolumeAttachment updated", "node", nodeName)
121121
va, ok := newObj.(*storagev1.VolumeAttachment)
122122
if !ok {

‎cmd/hooks/prestop_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func TestPreStopHook(t *testing.T) {
180180
mockStorageV1Interface.EXPECT().VolumeAttachments().Return(mockVolumeAttachments).AnyTimes()
181181
gomock.InOrder(
182182
mockVolumeAttachments.EXPECT().List(gomock.Any(), gomock.Any()).Return(fakeVolumeAttachments, nil).AnyTimes(),
183-
mockVolumeAttachments.EXPECT().Watch(gomock.Any(), gomock.Any()).DoAndReturn(func(signal, watchSignal interface{}) (watch.Interface, error) {
183+
mockVolumeAttachments.EXPECT().Watch(gomock.Any(), gomock.Any()).DoAndReturn(func(signal, watchSignal any) (watch.Interface, error) {
184184
deleteSignal <- true
185185
return fakeWatcher, nil
186186
}).AnyTimes(),
@@ -306,7 +306,7 @@ func TestPreStopHook(t *testing.T) {
306306
mockStorageV1Interface.EXPECT().VolumeAttachments().Return(mockVolumeAttachments).AnyTimes()
307307
gomock.InOrder(
308308
mockVolumeAttachments.EXPECT().List(gomock.Any(), gomock.Any()).Return(fakeVolumeAttachments, nil).AnyTimes(),
309-
mockVolumeAttachments.EXPECT().Watch(gomock.Any(), gomock.Any()).DoAndReturn(func(signal, watchSignal interface{}) (watch.Interface, error) {
309+
mockVolumeAttachments.EXPECT().Watch(gomock.Any(), gomock.Any()).DoAndReturn(func(signal, watchSignal any) (watch.Interface, error) {
310310
deleteSignal <- true
311311
return fakeWatcher, nil
312312
}).AnyTimes(),

‎deploy/kubernetes/base/csidriver.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ metadata:
99
spec:
1010
attachRequired: true
1111
podInfoOnMount: false
12-
nodeAllocatableUpdatePeriodSeconds: 10
1312
fsGroupPolicy: File

‎go.mod‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/kubernetes-sigs/aws-ebs-csi-driver
22

33
require (
4-
github.com/aws/aws-sdk-go-v2 v1.39.5
5-
github.com/aws/aws-sdk-go-v2/config v1.31.16
6-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12
7-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.261.0
8-
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.219.0
9-
github.com/aws/aws-sdk-go-v2/service/sts v1.39.0
4+
github.com/aws/aws-sdk-go-v2 v1.39.6
5+
github.com/aws/aws-sdk-go-v2/config v1.31.20
6+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13
7+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.269.0
8+
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.223.0
9+
github.com/aws/aws-sdk-go-v2/service/sts v1.40.2
1010
github.com/aws/smithy-go v1.23.2
1111
github.com/awslabs/volume-modifier-for-k8s v0.9.0
1212
github.com/container-storage-interface/spec v1.12.0
@@ -25,30 +25,30 @@ require (
2525
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
2626
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
2727
go.opentelemetry.io/otel/sdk v1.38.0
28-
golang.org/x/sys v0.37.0
28+
golang.org/x/sys v0.38.0
2929
golang.org/x/time v0.14.0
3030
google.golang.org/grpc v1.76.0
3131
google.golang.org/protobuf v1.36.10
32-
k8s.io/api v0.34.1
33-
k8s.io/apimachinery v0.34.1
34-
k8s.io/client-go v0.34.1
35-
k8s.io/component-base v0.34.1
32+
k8s.io/api v0.34.2
33+
k8s.io/apimachinery v0.34.2
34+
k8s.io/client-go v0.34.2
35+
k8s.io/component-base v0.34.2
3636
k8s.io/klog/v2 v2.130.1
37-
k8s.io/mount-utils v0.34.1
37+
k8s.io/mount-utils v0.34.2
3838
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3939
)
4040

4141
require (
4242
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4343
github.com/Microsoft/go-winio v0.6.2 // indirect
44-
github.com/aws/aws-sdk-go-v2/credentials v1.18.20 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 // indirect
46-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 // indirect
44+
github.com/aws/aws-sdk-go-v2/credentials v1.18.24 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
4747
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect
5252
github.com/beorn7/perks v1.0.1 // indirect
5353
github.com/blang/semver/v4 v4.0.0 // indirect
5454
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
@@ -59,8 +59,8 @@ require (
5959
github.com/go-logr/logr v1.4.3 // indirect
6060
github.com/go-logr/stdr v1.2.2 // indirect
6161
github.com/go-logr/zapr v1.3.0 // indirect
62-
github.com/go-openapi/jsonpointer v0.22.1 // indirect
63-
github.com/go-openapi/jsonreference v0.21.2 // indirect
62+
github.com/go-openapi/jsonpointer v0.22.2 // indirect
63+
github.com/go-openapi/jsonreference v0.21.3 // indirect
6464
github.com/go-openapi/swag v0.25.1 // indirect
6565
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
6666
github.com/go-openapi/swag/conv v0.25.1 // indirect
@@ -97,21 +97,21 @@ require (
9797
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
9898
go.opentelemetry.io/otel/metric v1.38.0 // indirect
9999
go.opentelemetry.io/otel/trace v1.38.0 // indirect
100-
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
100+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
101101
go.uber.org/automaxprocs v1.6.0 // indirect
102102
go.uber.org/multierr v1.11.0 // indirect
103103
go.uber.org/zap v1.27.0 // indirect
104104
go.yaml.in/yaml/v2 v2.4.3 // indirect
105105
go.yaml.in/yaml/v3 v3.0.4 // indirect
106-
golang.org/x/mod v0.28.0 // indirect
107-
golang.org/x/net v0.46.0 // indirect
108-
golang.org/x/oauth2 v0.32.0 // indirect
109-
golang.org/x/sync v0.17.0 // indirect
110-
golang.org/x/term v0.36.0 // indirect
111-
golang.org/x/text v0.30.0 // indirect
112-
golang.org/x/tools v0.37.0 // indirect
113-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
114-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
106+
golang.org/x/mod v0.29.0 // indirect
107+
golang.org/x/net v0.47.0 // indirect
108+
golang.org/x/oauth2 v0.33.0 // indirect
109+
golang.org/x/sync v0.18.0 // indirect
110+
golang.org/x/term v0.37.0 // indirect
111+
golang.org/x/text v0.31.0 // indirect
112+
golang.org/x/tools v0.38.0 // indirect
113+
google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba // indirect
114+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
115115
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
116116
gopkg.in/inf.v0 v0.9.1 // indirect
117117
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -126,4 +126,4 @@ require (
126126
// Workaround https://github.com/kubernetes-csi/csi-proxy/issues/411
127127
replace github.com/kubernetes-csi/csi-proxy/v2 => github.com/kubernetes-csi/csi-proxy/v2 v2.0.0-alpha.1
128128

129-
go 1.25.3
129+
go 1.25.4

0 commit comments

Comments
 (0)