From 16de1440aa871101296053c61bc1393f216dd3ca Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Wed, 18 Sep 2019 10:05:39 +0200
Subject: [PATCH] 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.

https://github.com/kubernetes/test-infra/pull/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.
---
 .../external-resizer/external-resizer-config.yaml           | 6 ------
 .../external-snapshotter/external-snapshotter-config.yaml   | 6 ------
 config/jobs/kubernetes-csi/gen-jobs.sh                      | 2 --
 .../kubernetes-csi/livenessprobe/livenessprobe-config.yaml  | 6 ------
 4 files changed, 20 deletions(-)

diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
index db8232951a451..fed93bcd8b7b6 100644
--- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
+++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
@@ -25,8 +25,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "unit"
         # docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
index b830da50b075c..5e69f40dfe49b 100644
--- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
+++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
@@ -25,8 +25,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "unit"
         # docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh
index 5ab09d023c2ad..37add32041116 100755
--- a/config/jobs/kubernetes-csi/gen-jobs.sh
+++ b/config/jobs/kubernetes-csi/gen-jobs.sh
@@ -344,8 +344,6 @@ EOF
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "${latest_stable_k8s_version}"
         - name: CSI_PROW_TESTS
           value: "$(expand_tests "$tests")"
         # docker-in-docker needs privileged mode
diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
index 00e8d8226d6a8..7223e26ddfac2 100644
--- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
+++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
@@ -25,8 +25,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -58,8 +56,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "unit"
         # docker-in-docker needs privileged mode
@@ -91,8 +87,6 @@ presubmits:
         args:
         - ./.prow.sh
         env:
-        - name: CSI_PROW_KUBERNETES_VERSION
-          value: "1.15.0"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode