Skip to content

Commit cd9aef3

Browse files
pohlypohly
committed
kubernetes-csi: test both flavors of csi-driver-host-path deployments
kubernetes-csi/csi-driver-host-path#282 introduces two kinds of deployments, with one pod for sidecar and driver (now the default) and individual pods for sidecars and drivers (what used to be the default, now in a "-prow" flavor for testing with Prow). We want to test both flavors before merging and periodically.
1 parent 8716584 commit cd9aef3

File tree

8 files changed

+1866
-242
lines changed

8 files changed

+1866
-242
lines changed

‎config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml

Lines changed: 1652 additions & 162 deletions
Large diffs are not rendered by default.

‎config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ presubmits:
3636
value: "true"
3737
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3838
value: "1.18"
39+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
40+
value: ""
3941
- name: CSI_PROW_DRIVER_VERSION
4042
value: "v1.6.0"
4143
- name: CSI_SNAPSHOTTER_VERSION
@@ -80,6 +82,8 @@ presubmits:
8082
value: "false"
8183
- name: CSI_PROW_DRIVER_VERSION
8284
value: "v1.6.0"
85+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
86+
value: ""
8387
- name: CSI_SNAPSHOTTER_VERSION
8488
value: "master"
8589
- name: CSI_PROW_TESTS
@@ -128,6 +132,8 @@ presubmits:
128132
value: "true"
129133
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
130134
value: "1.19"
135+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
136+
value: ""
131137
- name: CSI_PROW_DRIVER_VERSION
132138
value: "v1.6.0"
133139
- name: CSI_SNAPSHOTTER_VERSION
@@ -172,6 +178,8 @@ presubmits:
172178
value: "false"
173179
- name: CSI_PROW_DRIVER_VERSION
174180
value: "v1.6.0"
181+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
182+
value: ""
175183
- name: CSI_SNAPSHOTTER_VERSION
176184
value: "master"
177185
- name: CSI_PROW_TESTS
@@ -220,6 +228,8 @@ presubmits:
220228
value: "true"
221229
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
222230
value: "1.20"
231+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
232+
value: ""
223233
- name: CSI_PROW_DRIVER_VERSION
224234
value: "v1.6.0"
225235
- name: CSI_SNAPSHOTTER_VERSION
@@ -264,6 +274,8 @@ presubmits:
264274
value: "false"
265275
- name: CSI_PROW_DRIVER_VERSION
266276
value: "v1.6.0"
277+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
278+
value: ""
267279
- name: CSI_SNAPSHOTTER_VERSION
268280
value: "master"
269281
- name: CSI_PROW_TESTS
@@ -295,7 +307,7 @@ presubmits:
295307
spec:
296308
containers:
297309
# We need this image because it has Docker in Docker and go.
298-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
310+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
299311
command:
300312
- runner.sh
301313
args:
@@ -312,6 +324,8 @@ presubmits:
312324
value: "false"
313325
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
314326
value: "1.21"
327+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
328+
value: ""
315329
- name: CSI_PROW_DRIVER_VERSION
316330
value: "v1.6.0"
317331
- name: CSI_SNAPSHOTTER_VERSION
@@ -348,7 +362,7 @@ presubmits:
348362
spec:
349363
containers:
350364
# We need this image because it has Docker in Docker and go.
351-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
365+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
352366
command:
353367
- runner.sh
354368
args:
@@ -360,6 +374,8 @@ presubmits:
360374
value: "false"
361375
- name: CSI_PROW_DRIVER_VERSION
362376
value: "v1.6.0"
377+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
378+
value: ""
363379
- name: CSI_SNAPSHOTTER_VERSION
364380
value: "master"
365381
- name: CSI_PROW_TESTS
@@ -408,6 +424,8 @@ presubmits:
408424
value: "true"
409425
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
410426
value: "1.20"
427+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
428+
value: ""
411429
- name: CSI_PROW_DRIVER_VERSION
412430
value: "v1.6.0"
413431
- name: CSI_SNAPSHOTTER_VERSION

‎config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ presubmits:
3636
value: "true"
3737
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3838
value: "1.18"
39+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
40+
value: ""
3941
- name: CSI_PROW_DRIVER_VERSION
4042
value: "v1.6.0"
4143
- name: CSI_SNAPSHOTTER_VERSION
@@ -80,6 +82,8 @@ presubmits:
8082
value: "false"
8183
- name: CSI_PROW_DRIVER_VERSION
8284
value: "v1.6.0"
85+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
86+
value: ""
8387
- name: CSI_SNAPSHOTTER_VERSION
8488
value: "master"
8589
- name: CSI_PROW_TESTS
@@ -128,6 +132,8 @@ presubmits:
128132
value: "true"
129133
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
130134
value: "1.19"
135+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
136+
value: ""
131137
- name: CSI_PROW_DRIVER_VERSION
132138
value: "v1.6.0"
133139
- name: CSI_SNAPSHOTTER_VERSION
@@ -172,6 +178,8 @@ presubmits:
172178
value: "false"
173179
- name: CSI_PROW_DRIVER_VERSION
174180
value: "v1.6.0"
181+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
182+
value: ""
175183
- name: CSI_SNAPSHOTTER_VERSION
176184
value: "master"
177185
- name: CSI_PROW_TESTS
@@ -220,6 +228,8 @@ presubmits:
220228
value: "true"
221229
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
222230
value: "1.20"
231+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
232+
value: ""
223233
- name: CSI_PROW_DRIVER_VERSION
224234
value: "v1.6.0"
225235
- name: CSI_SNAPSHOTTER_VERSION
@@ -264,6 +274,8 @@ presubmits:
264274
value: "false"
265275
- name: CSI_PROW_DRIVER_VERSION
266276
value: "v1.6.0"
277+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
278+
value: ""
267279
- name: CSI_SNAPSHOTTER_VERSION
268280
value: "master"
269281
- name: CSI_PROW_TESTS
@@ -295,7 +307,7 @@ presubmits:
295307
spec:
296308
containers:
297309
# We need this image because it has Docker in Docker and go.
298-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
310+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
299311
command:
300312
- runner.sh
301313
args:
@@ -312,6 +324,8 @@ presubmits:
312324
value: "false"
313325
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
314326
value: "1.21"
327+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
328+
value: ""
315329
- name: CSI_PROW_DRIVER_VERSION
316330
value: "v1.6.0"
317331
- name: CSI_SNAPSHOTTER_VERSION
@@ -348,7 +362,7 @@ presubmits:
348362
spec:
349363
containers:
350364
# We need this image because it has Docker in Docker and go.
351-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
365+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
352366
command:
353367
- runner.sh
354368
args:
@@ -360,6 +374,8 @@ presubmits:
360374
value: "false"
361375
- name: CSI_PROW_DRIVER_VERSION
362376
value: "v1.6.0"
377+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
378+
value: ""
363379
- name: CSI_SNAPSHOTTER_VERSION
364380
value: "master"
365381
- name: CSI_PROW_TESTS
@@ -408,6 +424,8 @@ presubmits:
408424
value: "true"
409425
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
410426
value: "1.20"
427+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
428+
value: ""
411429
- name: CSI_PROW_DRIVER_VERSION
412430
value: "v1.6.0"
413431
- name: CSI_SNAPSHOTTER_VERSION

‎config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ presubmits:
3636
value: "true"
3737
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3838
value: "1.18"
39+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
40+
value: ""
3941
- name: CSI_PROW_DRIVER_VERSION
4042
value: "v1.6.0"
4143
- name: CSI_SNAPSHOTTER_VERSION
@@ -80,6 +82,8 @@ presubmits:
8082
value: "false"
8183
- name: CSI_PROW_DRIVER_VERSION
8284
value: "v1.6.0"
85+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
86+
value: ""
8387
- name: CSI_SNAPSHOTTER_VERSION
8488
value: "master"
8589
- name: CSI_PROW_TESTS
@@ -128,6 +132,8 @@ presubmits:
128132
value: "true"
129133
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
130134
value: "1.19"
135+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
136+
value: ""
131137
- name: CSI_PROW_DRIVER_VERSION
132138
value: "v1.6.0"
133139
- name: CSI_SNAPSHOTTER_VERSION
@@ -172,6 +178,8 @@ presubmits:
172178
value: "false"
173179
- name: CSI_PROW_DRIVER_VERSION
174180
value: "v1.6.0"
181+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
182+
value: ""
175183
- name: CSI_SNAPSHOTTER_VERSION
176184
value: "master"
177185
- name: CSI_PROW_TESTS
@@ -220,6 +228,8 @@ presubmits:
220228
value: "true"
221229
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
222230
value: "1.20"
231+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
232+
value: ""
223233
- name: CSI_PROW_DRIVER_VERSION
224234
value: "v1.6.0"
225235
- name: CSI_SNAPSHOTTER_VERSION
@@ -264,6 +274,8 @@ presubmits:
264274
value: "false"
265275
- name: CSI_PROW_DRIVER_VERSION
266276
value: "v1.6.0"
277+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
278+
value: ""
267279
- name: CSI_SNAPSHOTTER_VERSION
268280
value: "master"
269281
- name: CSI_PROW_TESTS
@@ -295,7 +307,7 @@ presubmits:
295307
spec:
296308
containers:
297309
# We need this image because it has Docker in Docker and go.
298-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
310+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
299311
command:
300312
- runner.sh
301313
args:
@@ -312,6 +324,8 @@ presubmits:
312324
value: "false"
313325
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
314326
value: "1.21"
327+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
328+
value: ""
315329
- name: CSI_PROW_DRIVER_VERSION
316330
value: "v1.6.0"
317331
- name: CSI_SNAPSHOTTER_VERSION
@@ -348,7 +362,7 @@ presubmits:
348362
spec:
349363
containers:
350364
# We need this image because it has Docker in Docker and go.
351-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
365+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
352366
command:
353367
- runner.sh
354368
args:
@@ -360,6 +374,8 @@ presubmits:
360374
value: "false"
361375
- name: CSI_PROW_DRIVER_VERSION
362376
value: "v1.6.0"
377+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
378+
value: ""
363379
- name: CSI_SNAPSHOTTER_VERSION
364380
value: "master"
365381
- name: CSI_PROW_TESTS
@@ -408,6 +424,8 @@ presubmits:
408424
value: "true"
409425
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
410426
value: "1.20"
427+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
428+
value: ""
411429
- name: CSI_PROW_DRIVER_VERSION
412430
value: "v1.6.0"
413431
- name: CSI_SNAPSHOTTER_VERSION

‎config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ presubmits:
3636
value: "true"
3737
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3838
value: "1.18"
39+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
40+
value: ""
3941
- name: CSI_PROW_DRIVER_VERSION
4042
value: "v1.6.0"
4143
- name: CSI_SNAPSHOTTER_VERSION
@@ -80,6 +82,8 @@ presubmits:
8082
value: "false"
8183
- name: CSI_PROW_DRIVER_VERSION
8284
value: "v1.6.0"
85+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
86+
value: ""
8387
- name: CSI_SNAPSHOTTER_VERSION
8488
value: "master"
8589
- name: CSI_PROW_TESTS
@@ -128,6 +132,8 @@ presubmits:
128132
value: "true"
129133
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
130134
value: "1.19"
135+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
136+
value: ""
131137
- name: CSI_PROW_DRIVER_VERSION
132138
value: "v1.6.0"
133139
- name: CSI_SNAPSHOTTER_VERSION
@@ -172,6 +178,8 @@ presubmits:
172178
value: "false"
173179
- name: CSI_PROW_DRIVER_VERSION
174180
value: "v1.6.0"
181+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
182+
value: ""
175183
- name: CSI_SNAPSHOTTER_VERSION
176184
value: "master"
177185
- name: CSI_PROW_TESTS
@@ -220,6 +228,8 @@ presubmits:
220228
value: "true"
221229
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
222230
value: "1.20"
231+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
232+
value: ""
223233
- name: CSI_PROW_DRIVER_VERSION
224234
value: "v1.6.0"
225235
- name: CSI_SNAPSHOTTER_VERSION
@@ -264,6 +274,8 @@ presubmits:
264274
value: "false"
265275
- name: CSI_PROW_DRIVER_VERSION
266276
value: "v1.6.0"
277+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
278+
value: ""
267279
- name: CSI_SNAPSHOTTER_VERSION
268280
value: "master"
269281
- name: CSI_PROW_TESTS
@@ -295,7 +307,7 @@ presubmits:
295307
spec:
296308
containers:
297309
# We need this image because it has Docker in Docker and go.
298-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
310+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
299311
command:
300312
- runner.sh
301313
args:
@@ -312,6 +324,8 @@ presubmits:
312324
value: "false"
313325
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
314326
value: "1.21"
327+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
328+
value: ""
315329
- name: CSI_PROW_DRIVER_VERSION
316330
value: "v1.6.0"
317331
- name: CSI_SNAPSHOTTER_VERSION
@@ -348,7 +362,7 @@ presubmits:
348362
spec:
349363
containers:
350364
# We need this image because it has Docker in Docker and go.
351-
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210418-e5f251e-master
365+
- image: gcr.io/k8s-testimages/kubekins-e2e:v20210428-a1a20d1-master
352366
command:
353367
- runner.sh
354368
args:
@@ -360,6 +374,8 @@ presubmits:
360374
value: "false"
361375
- name: CSI_PROW_DRIVER_VERSION
362376
value: "v1.6.0"
377+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
378+
value: ""
363379
- name: CSI_SNAPSHOTTER_VERSION
364380
value: "master"
365381
- name: CSI_PROW_TESTS
@@ -408,6 +424,8 @@ presubmits:
408424
value: "true"
409425
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
410426
value: "1.20"
427+
- name: CSI_PROW_KUBERNETES_DEPLOYMENT_SUFFIX
428+
value: ""
411429
- name: CSI_PROW_DRIVER_VERSION
412430
value: "v1.6.0"
413431
- name: CSI_SNAPSHOTTER_VERSION

0 commit comments

Comments
 (0)