Skip to content

Commit dc3514c

Browse files
authored
Merge pull request #2259 from ConnorJC3/138-deps
Bump dependencies for release v1.38.0
2 parents 2bfdb2a + fdcbc13 commit dc3514c

File tree

9 files changed

+184
-163
lines changed

9 files changed

+184
-163
lines changed

charts/aws-ebs-csi-driver/values.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sidecars:
1717
image:
1818
pullPolicy: IfNotPresent
1919
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
20-
tag: "v5.1.0-eks-1-31-7"
20+
tag: "v5.1.0-eks-1-32-1"
2121
logLevel: 2
2222
# Additional parameters provided by external-provisioner.
2323
additionalArgs: []
@@ -44,7 +44,7 @@ sidecars:
4444
image:
4545
pullPolicy: IfNotPresent
4646
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
47-
tag: "v4.7.0-eks-1-31-7"
47+
tag: "v4.7.0-eks-1-32-1"
4848
# Tune leader lease election for csi-attacher.
4949
# Leader election is on by default.
5050
leaderElection:
@@ -73,7 +73,7 @@ sidecars:
7373
image:
7474
pullPolicy: IfNotPresent
7575
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
76-
tag: "v8.1.0-eks-1-31-7"
76+
tag: "v8.1.0-eks-1-32-1"
7777
logLevel: 2
7878
# Additional parameters provided by csi-snapshotter.
7979
additionalArgs: []
@@ -89,7 +89,7 @@ sidecars:
8989
image:
9090
pullPolicy: IfNotPresent
9191
repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
92-
tag: "v2.14.0-eks-1-31-7"
92+
tag: "v2.14.0-eks-1-32-1"
9393
# Additional parameters provided by livenessprobe.
9494
additionalArgs: []
9595
resources: {}
@@ -101,7 +101,7 @@ sidecars:
101101
image:
102102
pullPolicy: IfNotPresent
103103
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
104-
tag: "v1.12.0-eks-1-31-7"
104+
tag: "v1.12.0-eks-1-32-1"
105105
# Tune leader lease election for csi-resizer.
106106
# Leader election is on by default.
107107
leaderElection:
@@ -128,7 +128,7 @@ sidecars:
128128
image:
129129
pullPolicy: IfNotPresent
130130
repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
131-
tag: "v2.12.0-eks-1-31-7"
131+
tag: "v2.12.0-eks-1-32-1"
132132
logLevel: 2
133133
# Additional parameters provided by node-driver-registrar.
134134
additionalArgs: []
@@ -150,7 +150,7 @@ sidecars:
150150
image:
151151
pullPolicy: IfNotPresent
152152
repository: public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s
153-
tag: "v0.4.0"
153+
tag: "v0.5.0"
154154
leaderElection:
155155
enabled: true
156156
# Optional values to tune lease behavior.
@@ -503,4 +503,4 @@ nodeComponentOnly: false
503503
helmTester:
504504
enabled: true
505505
# Supply a custom image to the ebs-csi-driver-test pod in helm-tester.yaml
506-
image: "us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20241021-d3a4913879-master"
506+
image: "us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20241128-8df65c072f-master"

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:v20240718-5ef92b5c36
17+
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241111-71c32dbdcc
1818
entrypoint: ./hack/cloudbuild.sh
1919
env:
2020
- GIT_TAG=${_GIT_TAG}

deploy/kubernetes/base/controller.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ spec:
133133
seccompProfile:
134134
type: RuntimeDefault
135135
- name: csi-provisioner
136-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-31-7
136+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-32-1
137137
imagePullPolicy: IfNotPresent
138138
args:
139139
- --timeout=60s
@@ -166,7 +166,7 @@ spec:
166166
seccompProfile:
167167
type: RuntimeDefault
168168
- name: csi-attacher
169-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.7.0-eks-1-31-7
169+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.7.0-eks-1-32-1
170170
imagePullPolicy: IfNotPresent
171171
args:
172172
- --timeout=60s
@@ -195,7 +195,7 @@ spec:
195195
seccompProfile:
196196
type: RuntimeDefault
197197
- name: csi-snapshotter
198-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v8.1.0-eks-1-31-7
198+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v8.1.0-eks-1-32-1
199199
imagePullPolicy: IfNotPresent
200200
args:
201201
- --csi-address=$(ADDRESS)
@@ -224,7 +224,7 @@ spec:
224224
seccompProfile:
225225
type: RuntimeDefault
226226
- name: csi-resizer
227-
image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.12.0-eks-1-31-7
227+
image: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.12.0-eks-1-32-1
228228
imagePullPolicy: IfNotPresent
229229
args:
230230
- --timeout=60s
@@ -255,7 +255,7 @@ spec:
255255
seccompProfile:
256256
type: RuntimeDefault
257257
- name: liveness-probe
258-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-7
258+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-1
259259
imagePullPolicy: IfNotPresent
260260
args:
261261
- --csi-address=/csi/csi.sock

deploy/kubernetes/base/node.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ spec:
105105
exec:
106106
command: ["/bin/aws-ebs-csi-driver", "pre-stop-hook"]
107107
- name: node-driver-registrar
108-
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.12.0-eks-1-31-7
108+
image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.12.0-eks-1-32-1
109109
imagePullPolicy: IfNotPresent
110110
args:
111111
- --csi-address=$(ADDRESS)
@@ -142,7 +142,7 @@ spec:
142142
allowPrivilegeEscalation: false
143143
readOnlyRootFilesystem: true
144144
- name: liveness-probe
145-
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-7
145+
image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-1
146146
imagePullPolicy: IfNotPresent
147147
args:
148148
- --csi-address=/csi/csi.sock

go.mod

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ require (
44
github.com/aws/aws-sdk-go-v2 v1.32.6
55
github.com/aws/aws-sdk-go-v2/config v1.28.6
66
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21
7-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.195.0
7+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.196.0
88
github.com/aws/smithy-go v1.22.1
9-
github.com/awslabs/volume-modifier-for-k8s v0.4.0
9+
github.com/awslabs/volume-modifier-for-k8s v0.5.0
1010
github.com/container-storage-interface/spec v1.11.0
1111
github.com/golang/mock v1.6.0
1212
github.com/google/go-cmp v0.6.0
@@ -15,7 +15,7 @@ require (
1515
github.com/kubernetes-csi/csi-proxy/v2 v2.0.0-alpha.1
1616
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
1717
github.com/onsi/ginkgo/v2 v2.22.0
18-
github.com/onsi/gomega v1.36.0
18+
github.com/onsi/gomega v1.36.1
1919
github.com/prometheus/client_golang v1.20.5
2020
github.com/spf13/pflag v1.0.5
2121
github.com/stretchr/testify v1.10.0
@@ -24,22 +24,22 @@ require (
2424
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0
2525
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
2626
go.opentelemetry.io/otel/sdk v1.32.0
27-
golang.org/x/sys v0.27.0
28-
google.golang.org/grpc v1.68.0
27+
golang.org/x/sys v0.28.0
28+
google.golang.org/grpc v1.68.1
2929
google.golang.org/protobuf v1.35.2
30-
k8s.io/api v0.31.3
31-
k8s.io/apimachinery v0.31.3
32-
k8s.io/client-go v0.31.3
33-
k8s.io/component-base v0.31.2
30+
k8s.io/api v0.31.4
31+
k8s.io/apimachinery v0.31.4
32+
k8s.io/client-go v0.31.4
33+
k8s.io/component-base v0.31.4
3434
k8s.io/klog/v2 v2.130.1
35-
k8s.io/kubernetes v1.31.3
36-
k8s.io/mount-utils v0.31.2
37-
k8s.io/pod-security-admission v0.31.2
38-
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
35+
k8s.io/kubernetes v1.31.4
36+
k8s.io/mount-utils v0.31.4
37+
k8s.io/pod-security-admission v0.31.4
38+
k8s.io/utils v0.0.0-20241210054802-24370beab758
3939
)
4040

4141
require (
42-
cel.dev/expr v0.19.0 // indirect
42+
cel.dev/expr v0.19.1 // indirect
4343
github.com/Microsoft/go-winio v0.6.2 // indirect
4444
github.com/NYTimes/gziphandler v1.1.1 // indirect
4545
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -73,12 +73,12 @@ require (
7373
github.com/go-openapi/swag v0.23.0 // indirect
7474
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7575
github.com/gogo/protobuf v1.3.2 // indirect
76-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
76+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7777
github.com/golang/protobuf v1.5.4 // indirect
7878
github.com/google/cel-go v0.22.1 // indirect
7979
github.com/google/gnostic-models v0.6.9 // indirect
8080
github.com/google/gofuzz v1.2.0 // indirect
81-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
81+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
8282
github.com/gorilla/websocket v1.5.3 // indirect
8383
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8484
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
@@ -97,12 +97,12 @@ require (
9797
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9898
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9999
github.com/opencontainers/go-digest v1.0.0 // indirect
100-
github.com/opencontainers/runc v1.2.2 // indirect
100+
github.com/opencontainers/runc v1.2.3 // indirect
101101
github.com/opencontainers/selinux v1.11.1 // indirect
102102
github.com/pkg/errors v0.9.1 // indirect
103103
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104104
github.com/prometheus/client_model v0.6.1 // indirect
105-
github.com/prometheus/common v0.60.1 // indirect
105+
github.com/prometheus/common v0.61.0 // indirect
106106
github.com/prometheus/procfs v0.15.1 // indirect
107107
github.com/spf13/cobra v1.8.1 // indirect
108108
github.com/stoewer/go-strcase v1.3.0 // indirect
@@ -116,67 +116,67 @@ require (
116116
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
117117
go.uber.org/multierr v1.11.0 // indirect
118118
go.uber.org/zap v1.27.0 // indirect
119-
golang.org/x/crypto v0.29.0 // indirect
120-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
121-
golang.org/x/net v0.31.0 // indirect
119+
golang.org/x/crypto v0.30.0 // indirect
120+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
121+
golang.org/x/net v0.32.0 // indirect
122122
golang.org/x/oauth2 v0.24.0 // indirect
123-
golang.org/x/sync v0.9.0 // indirect
124-
golang.org/x/term v0.26.0 // indirect
125-
golang.org/x/text v0.20.0 // indirect
123+
golang.org/x/sync v0.10.0 // indirect
124+
golang.org/x/term v0.27.0 // indirect
125+
golang.org/x/text v0.21.0 // indirect
126126
golang.org/x/time v0.8.0 // indirect
127-
golang.org/x/tools v0.27.0 // indirect
128-
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
129-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
127+
golang.org/x/tools v0.28.0 // indirect
128+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
130130
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
131131
gopkg.in/inf.v0 v0.9.1 // indirect
132132
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
133133
gopkg.in/yaml.v2 v2.4.0 // indirect
134134
gopkg.in/yaml.v3 v3.0.1 // indirect
135-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
136-
k8s.io/apiserver v0.31.2 // indirect
137-
k8s.io/cloud-provider v0.31.1 // indirect
138-
k8s.io/component-helpers v0.31.3 // indirect
139-
k8s.io/controller-manager v0.31.2 // indirect
140-
k8s.io/kms v0.31.3 // indirect
141-
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
142-
k8s.io/kubectl v0.31.2 // indirect
143-
k8s.io/kubelet v0.31.1 // indirect
135+
k8s.io/apiextensions-apiserver v0.31.4 // indirect
136+
k8s.io/apiserver v0.31.4 // indirect
137+
k8s.io/cloud-provider v0.31.4 // indirect
138+
k8s.io/component-helpers v0.31.4 // indirect
139+
k8s.io/controller-manager v0.31.4 // indirect
140+
k8s.io/kms v0.31.4 // indirect
141+
k8s.io/kube-openapi v0.0.0-20241127205056-99599406b04f // indirect
142+
k8s.io/kubectl v0.31.4 // indirect
143+
k8s.io/kubelet v0.31.4 // indirect
144144
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
145145
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
146146
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
147147
sigs.k8s.io/yaml v1.4.0 // indirect
148148
)
149149

150150
replace (
151-
k8s.io/api => k8s.io/api v0.31.2
152-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.2
153-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.2
154-
k8s.io/apiserver => k8s.io/apiserver v0.31.2
155-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.2
156-
k8s.io/client-go => k8s.io/client-go v0.31.2
157-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.2
158-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.2
159-
k8s.io/code-generator => k8s.io/code-generator v0.31.2
160-
k8s.io/component-base => k8s.io/component-base v0.31.2
161-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.2
162-
k8s.io/cri-api => k8s.io/cri-api v0.31.2
163-
k8s.io/cri-client => k8s.io/cri-client v0.31.2
164-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.2
165-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.2
166-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.2
167-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.2
168-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.2
169-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.2
170-
k8s.io/kubectl => k8s.io/kubectl v0.31.2
171-
k8s.io/kubelet => k8s.io/kubelet v0.31.2
172-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.2
173-
k8s.io/metrics => k8s.io/metrics v0.31.2
174-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.2
175-
k8s.io/node-api => k8s.io/node-api v0.31.2
176-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.2
177-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.2
178-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.2
179-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.2
151+
k8s.io/api => k8s.io/api v0.31.4
152+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.4
153+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.4
154+
k8s.io/apiserver => k8s.io/apiserver v0.31.4
155+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.4
156+
k8s.io/client-go => k8s.io/client-go v0.31.4
157+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.4
158+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.4
159+
k8s.io/code-generator => k8s.io/code-generator v0.31.4
160+
k8s.io/component-base => k8s.io/component-base v0.31.4
161+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.4
162+
k8s.io/cri-api => k8s.io/cri-api v0.31.4
163+
k8s.io/cri-client => k8s.io/cri-client v0.31.4
164+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.4
165+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.4
166+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.4
167+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.4
168+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.4
169+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.4
170+
k8s.io/kubectl => k8s.io/kubectl v0.31.4
171+
k8s.io/kubelet => k8s.io/kubelet v0.31.4
172+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.4
173+
k8s.io/metrics => k8s.io/metrics v0.31.4
174+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.4
175+
k8s.io/node-api => k8s.io/node-api v0.31.4
176+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.4
177+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.4
178+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.4
179+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.4
180180
vbom.ml/util => github.com/fvbommel/util v0.0.2 // Mitigate https://github.com/fvbommel/util/issues/6
181181
)
182182

0 commit comments

Comments
 (0)