Skip to content

Commit 9aa1dfc

Browse files
committed
kubernetes-csi: avoid overriding Kubernetes version for single-Kubernetes repos
The original intention was to let repos which only need to be tested against a single Kubernetes release choose that release themselves. The comment for `single_kubernetes_repos` still describes that behavior. kubernetes#13434 changed that so that 1.15 is used for all of these repos because of some issues with external-snapshotter. external-snapshotter now has 1.15 in its own prow.sh, so we don't need the override anymore in the test job and can revert to the original behavior.
1 parent 97746be commit 9aa1dfc

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ presubmits:
2525
args:
2626
- ./.prow.sh
2727
env:
28-
- name: CSI_PROW_KUBERNETES_VERSION
29-
value: "1.15.0"
3028
- name: CSI_PROW_TESTS
3129
value: "sanity serial parallel"
3230
# docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
5856
args:
5957
- ./.prow.sh
6058
env:
61-
- name: CSI_PROW_KUBERNETES_VERSION
62-
value: "1.15.0"
6359
- name: CSI_PROW_TESTS
6460
value: "unit"
6561
# docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
9187
args:
9288
- ./.prow.sh
9389
env:
94-
- name: CSI_PROW_KUBERNETES_VERSION
95-
value: "1.15.0"
9690
- name: CSI_PROW_TESTS
9791
value: "serial-alpha parallel-alpha"
9892
# docker-in-docker needs privileged mode

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ presubmits:
2525
args:
2626
- ./.prow.sh
2727
env:
28-
- name: CSI_PROW_KUBERNETES_VERSION
29-
value: "1.15.0"
3028
- name: CSI_PROW_TESTS
3129
value: "sanity serial parallel"
3230
# docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
5856
args:
5957
- ./.prow.sh
6058
env:
61-
- name: CSI_PROW_KUBERNETES_VERSION
62-
value: "1.15.0"
6359
- name: CSI_PROW_TESTS
6460
value: "unit"
6561
# docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
9187
args:
9288
- ./.prow.sh
9389
env:
94-
- name: CSI_PROW_KUBERNETES_VERSION
95-
value: "1.15.0"
9690
- name: CSI_PROW_TESTS
9791
value: "serial-alpha parallel-alpha"
9892
# docker-in-docker needs privileged mode

config/jobs/kubernetes-csi/gen-jobs.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,6 @@ EOF
332332
args:
333333
- ./.prow.sh
334334
env:
335-
- name: CSI_PROW_KUBERNETES_VERSION
336-
value: "${latest_stable_k8s_version}"
337335
- name: CSI_PROW_TESTS
338336
value: "$(expand_tests "$tests")"
339337
# docker-in-docker needs privileged mode

config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ presubmits:
2525
args:
2626
- ./.prow.sh
2727
env:
28-
- name: CSI_PROW_KUBERNETES_VERSION
29-
value: "1.15.0"
3028
- name: CSI_PROW_TESTS
3129
value: "sanity serial parallel"
3230
# docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
5856
args:
5957
- ./.prow.sh
6058
env:
61-
- name: CSI_PROW_KUBERNETES_VERSION
62-
value: "1.15.0"
6359
- name: CSI_PROW_TESTS
6460
value: "unit"
6561
# docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
9187
args:
9288
- ./.prow.sh
9389
env:
94-
- name: CSI_PROW_KUBERNETES_VERSION
95-
value: "1.15.0"
9690
- name: CSI_PROW_TESTS
9791
value: "serial-alpha parallel-alpha"
9892
# docker-in-docker needs privileged mode

0 commit comments

Comments
 (0)