Skip to content

Commit 5fd69a7

Browse files
committed
fix(kubernetes): pin KubeVirt CSI sidecars to SIG Storage releases
1 parent 9c7bfb8 commit 5fd69a7

4 files changed

Lines changed: 58 additions & 5 deletions

File tree

‎packages/apps/kubernetes/templates/csi/deploy.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
- ALL
8080
readOnlyRootFilesystem: true
8181
- name: csi-provisioner
82-
image: quay.io/openshift/origin-csi-external-provisioner:latest
82+
image: registry.k8s.io/sig-storage/csi-provisioner:v6.1.0
8383
resources:
8484
limits:
8585
cpu: 512m
@@ -109,7 +109,7 @@ spec:
109109
mountPath: /etc/kubernetes/kubeconfig
110110
readOnly: true
111111
- name: csi-attacher
112-
image: quay.io/openshift/origin-csi-external-attacher:latest
112+
image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
113113
args:
114114
- "--csi-address=$(ADDRESS)"
115115
- "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
@@ -138,7 +138,7 @@ spec:
138138
- ALL
139139
readOnlyRootFilesystem: true
140140
- name: csi-liveness-probe
141-
image: quay.io/openshift/origin-csi-livenessprobe:latest
141+
image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
142142
args:
143143
- "--csi-address=/csi/csi.sock"
144144
- "--probe-timeout=3s"
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
suite: KubeVirt CSI sidecar images
2+
3+
templates:
4+
- templates/csi/deploy.yaml
5+
6+
values:
7+
- values/common.yaml
8+
9+
release:
10+
name: test-k8s
11+
namespace: tenant-test
12+
13+
tests:
14+
- it: uses versioned upstream sig-storage sidecars
15+
documentSelector:
16+
path: kind
17+
value: Deployment
18+
asserts:
19+
- equal:
20+
path: spec.template.spec.containers[1].name
21+
value: csi-provisioner
22+
- equal:
23+
path: spec.template.spec.containers[1].image
24+
value: registry.k8s.io/sig-storage/csi-provisioner:v6.1.0
25+
- equal:
26+
path: spec.template.spec.containers[2].name
27+
value: csi-attacher
28+
- equal:
29+
path: spec.template.spec.containers[2].image
30+
value: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
31+
- equal:
32+
path: spec.template.spec.containers[3].name
33+
value: csi-liveness-probe
34+
- equal:
35+
path: spec.template.spec.containers[3].image
36+
value: registry.k8s.io/sig-storage/livenessprobe:v2.17.0

‎packages/system/kubevirt-csi-node/templates/deploy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ spec:
208208
limits:
209209
memory: 512Mi
210210
- name: csi-node-driver-registrar
211-
image: quay.io/openshift/origin-csi-node-driver-registrar:latest
211+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.17.0
212212
args:
213213
- "--csi-address=$(ADDRESS)"
214214
- "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@@ -234,7 +234,7 @@ spec:
234234
limits:
235235
memory: 128Mi
236236
- name: csi-liveness-probe
237-
image: quay.io/openshift/origin-csi-livenessprobe:latest
237+
image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
238238
args:
239239
- "--csi-address=/csi/csi.sock"
240240
- "--probe-timeout=3s"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
suite: csi-node sidecar images
2+
3+
templates:
4+
- templates/deploy.yaml
5+
6+
tests:
7+
- it: pins upstream CSI sidecars to versioned release tags
8+
documentSelector:
9+
path: kind
10+
value: DaemonSet
11+
asserts:
12+
- equal:
13+
path: spec.template.spec.containers[?(@.name=="csi-node-driver-registrar")].image
14+
value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.17.0
15+
- equal:
16+
path: spec.template.spec.containers[?(@.name=="csi-liveness-probe")].image
17+
value: registry.k8s.io/sig-storage/livenessprobe:v2.17.0

0 commit comments

Comments
 (0)