Skip to content

Commit dd465b8

Browse files
authored
Merge pull request kubernetes#86939 from msau42/update-sidecars
Update hostpath and mock csi drivers with latest sidecars
2 parents 9d1eb45 + d829d9b commit dd465b8

File tree

7 files changed

+8
-18
lines changed

7 files changed

+8
-18
lines changed

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
serviceAccountName: csi-attacher
4141
containers:
4242
- name: csi-attacher
43-
image: quay.io/k8scsi/csi-attacher:v2.0.0
43+
image: quay.io/k8scsi/csi-attacher:v2.1.0
4444
args:
4545
- --v=5
4646
- --csi-address=/csi/csi.sock

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ spec:
4040
serviceAccountName: csi-provisioner
4141
containers:
4242
- name: csi-provisioner
43-
# TODO: replace with official 1.5.0 release when ready
44-
image: quay.io/k8scsi/csi-provisioner:v1.5.0-rc1
43+
image: quay.io/k8scsi/csi-provisioner:v1.5.0
4544
args:
4645
- -v=5
4746
- --csi-address=/csi/csi.sock

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
serviceAccountName: csi-resizer
3131
containers:
3232
- name: csi-resizer
33-
image: quay.io/k8scsi/csi-resizer:v0.3.0
33+
image: quay.io/k8scsi/csi-resizer:v0.4.0
3434
args:
3535
- "--v=5"
3636
- "--csi-address=$(ADDRESS)"
@@ -42,7 +42,6 @@ spec:
4242
# non-privileged sidecar containers cannot access unix domain socket
4343
# created by privileged CSI driver container.
4444
privileged: true
45-
imagePullPolicy: Always
4645
volumeMounts:
4746
- mountPath: /csi
4847
name: socket-dir

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ spec:
3030
serviceAccount: csi-snapshotter
3131
containers:
3232
- name: csi-snapshotter
33-
# TODO: replace with official 2.0.0 release when ready
34-
image: quay.io/k8scsi/csi-snapshotter:v2.0.0-rc2
33+
image: quay.io/k8scsi/csi-snapshotter:v2.0.0
3534
args:
3635
- "--v=5"
3736
- "--csi-address=$(ADDRESS)"
@@ -43,7 +42,6 @@ spec:
4342
# non-privileged sidecar containers cannot access unix domain socket
4443
# created by privileged CSI driver container.
4544
privileged: true
46-
imagePullPolicy: Always
4745
volumeMounts:
4846
- name: socket-dir
4947
mountPath: /csi

test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ spec:
1515
serviceAccountName: csi-mock
1616
containers:
1717
- name: csi-attacher
18-
image: quay.io/k8scsi/csi-attacher:v1.1.0
18+
image: quay.io/k8scsi/csi-attacher:v2.1.0
1919
args:
2020
- --v=5
2121
- --csi-address=$(ADDRESS)
2222
env:
2323
- name: ADDRESS
2424
value: /csi/csi.sock
25-
imagePullPolicy: Always
2625
securityContext:
2726
privileged: true
2827
volumeMounts:

test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ spec:
1515
serviceAccountName: csi-mock
1616
containers:
1717
- name: csi-resizer
18-
image: quay.io/k8scsi/csi-resizer:v0.1.0
18+
image: quay.io/k8scsi/csi-resizer:v0.4.0
1919
args:
2020
- "--v=5"
2121
- "--csi-address=$(ADDRESS)"
2222
env:
2323
- name: ADDRESS
2424
value: /csi/csi.sock
25-
imagePullPolicy: Always
2625
securityContext:
2726
privileged: true
2827
volumeMounts:

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@ spec:
1515
serviceAccountName: csi-mock
1616
containers:
1717
- name: csi-provisioner
18-
# TODO: replace with official 1.4.0 release when ready
19-
image: quay.io/k8scsi/csi-provisioner:v1.4.0-rc1
18+
image: quay.io/k8scsi/csi-provisioner:v1.5.0
2019
args:
2120
- "--csi-address=$(ADDRESS)"
2221
- "--connection-timeout=15s"
2322
env:
2423
- name: ADDRESS
2524
value: /csi/csi.sock
26-
imagePullPolicy: Always
2725
volumeMounts:
2826
- mountPath: /csi
2927
name: socket-dir
3028
- name: driver-registrar
31-
image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
29+
image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
3230
args:
3331
- --v=5
3432
- --csi-address=/csi/csi.sock
@@ -39,7 +37,6 @@ spec:
3937
fieldRef:
4038
apiVersion: v1
4139
fieldPath: spec.nodeName
42-
imagePullPolicy: Always
4340
securityContext:
4441
privileged: true
4542
volumeMounts:
@@ -62,7 +59,6 @@ spec:
6259
fieldPath: spec.nodeName
6360
securityContext:
6461
privileged: true
65-
imagePullPolicy: IfNotPresent
6662
volumeMounts:
6763
- mountPath: /csi
6864
name: socket-dir

0 commit comments

Comments
 (0)