Skip to content

Commit b3095a4

Browse files
authored
Merge pull request kubernetes#130519 from dims/reduce-the-number-of-versions-of-images-we-pull-in-our-e2e-tests
Reduce number of (versions of!) images we pull in our e2e tests
2 parents b363f19 + 1e64a89 commit b3095a4

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

test/e2e/dra/test-driver/deploy/example/pod-external.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ spec:
2323
restartPolicy: Never
2424
containers:
2525
- name: with-resource
26-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
26+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
2727
command: ["sh", "-c", "set && mount && ls -la /dev/"]
2828
resources:
2929
claims:
3030
- name: resource
3131
- name: without-resource
32-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
32+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
3333
command: ["sh", "-c", "set && mount && ls -la /dev/"]
3434
resourceClaims:
3535
- name: resource

test/e2e/dra/test-driver/deploy/example/pod-inline.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ spec:
2828
restartPolicy: Never
2929
containers:
3030
- name: with-resource
31-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
31+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
3232
command: ["sh", "-c", "set && mount && ls -la /dev/"]
3333
resources:
3434
claims:
3535
- name: resource
3636
- name: without-resource
37-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
37+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
3838
command: ["sh", "-c", "set && mount && ls -la /dev/"]
3939
resourceClaims:
4040
- name: resource

test/e2e/dra/test-driver/deploy/example/pod-shared.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ spec:
2424
restartPolicy: Never
2525
containers:
2626
- name: with-resource
27-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
27+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
2828
command: ["sh", "-c", "set && mount && ls -la /dev/"]
2929
resources:
3030
claims:
3131
- name: resource
3232
- name: without-resource
33-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
33+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
3434
command: ["sh", "-c", "set && mount && ls -la /dev/"]
3535
resourceClaims:
3636
- name: resource
@@ -44,13 +44,13 @@ spec:
4444
restartPolicy: Never
4545
containers:
4646
- name: with-resource
47-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
47+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
4848
command: ["sh", "-c", "set && mount && ls -la /dev/"]
4949
resources:
5050
claims:
5151
- name: resource
5252
- name: without-resource
53-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
53+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
5454
command: ["sh", "-c", "set && mount && ls -la /dev/"]
5555
resourceClaims:
5656
- name: resource

test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ spec:
276276
mountPath: /csi
277277

278278
- name: node-driver-registrar
279-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
279+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
280280
args:
281281
- --v=5
282282
- --csi-address=/csi/csi.sock
@@ -304,13 +304,13 @@ spec:
304304
volumeMounts:
305305
- mountPath: /csi
306306
name: socket-dir
307-
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
307+
image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
308308
args:
309309
- --csi-address=/csi/csi.sock
310310
- --health-port=9898
311311

312312
- name: csi-attacher
313-
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
313+
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
314314
args:
315315
- --v=5
316316
- --csi-address=/csi/csi.sock
@@ -324,7 +324,7 @@ spec:
324324
name: socket-dir
325325

326326
- name: csi-provisioner
327-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
327+
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
328328
args:
329329
- -v=5
330330
- --csi-address=/csi/csi.sock
@@ -340,7 +340,7 @@ spec:
340340
name: socket-dir
341341

342342
- name: csi-resizer
343-
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
343+
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
344344
args:
345345
- -v=5
346346
- -csi-address=/csi/csi.sock

test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: csi-driver-registrar
16-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
16+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
1717
args:
1818
- "--v=5"
1919
- "--csi-address=/csi/csi.sock"
@@ -48,7 +48,7 @@ spec:
4848
- name: gce-pd-driver
4949
securityContext:
5050
privileged: true
51-
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2
51+
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0
5252
args:
5353
- "--v=5"
5454
- "--endpoint=unix:/csi/csi.sock"

test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
# test for directories or create them. It needs additional privileges
7878
# for that.
7979
- name: busybox
80-
image: registry.k8s.io/e2e-test-images/busybox:1.29-2
80+
image: registry.k8s.io/e2e-test-images/busybox:1.36.1-1
8181
securityContext:
8282
privileged: true
8383
command:

0 commit comments

Comments
 (0)