Merge pull request #14948 from msau42/fix-csi

Pickup kind commit that fixes node image building
kubernetes · Oct 24, 2019 · 813e239 · 813e239
2 parents 7fa804e + 1773cd8
commit 813e239
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml
@@ -305,6 +305,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "release-1.14"
       - name: CSI_PROW_BUILD_JOB
@@ -345,6 +348,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "release-1.15"
       - name: CSI_PROW_BUILD_JOB
@@ -385,6 +391,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "latest"
       - name: CSI_PROW_BUILD_JOB
@@ -425,6 +434,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "release-1.14"
       - name: CSI_PROW_BUILD_JOB
@@ -465,6 +477,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "release-1.15"
       - name: CSI_PROW_BUILD_JOB
@@ -505,6 +520,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "latest"
       - name: CSI_PROW_BUILD_JOB
@@ -545,6 +563,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "release-1.15"
       - name: CSI_PROW_BUILD_JOB
@@ -585,6 +606,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "1.14.0"
       - name: CSI_PROW_BUILD_JOB
@@ -631,6 +655,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "1.15"
       - name: CSI_PROW_BUILD_JOB
@@ -677,6 +704,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "latest"
       - name: CSI_PROW_BUILD_JOB
@@ -723,6 +753,9 @@ periodics:
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "latest"
       - name: CSI_PROW_BUILD_JOB

diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh
@@ -25,7 +25,7 @@ latest_stable_k8s_version="1.15.0"
 latest_stable_k8s_minor_version="1.15"
 
 # We need this image because it has Docker in Docker and go.
-dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master"
+dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20191021-b891e54-master"
 
 # All kubernetes-csi repos which are part of the hostpath driver example.
 # For these repos we generate the full test matrix. For each entry here
@@ -506,6 +506,9 @@ for tests in non-alpha alpha; do
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "$actual"
       - name: CSI_PROW_BUILD_JOB
@@ -558,6 +561,9 @@ for kubernetes in 1.14.0 1.15 master; do
       args:
       - ./.prow.sh
       env:
+      # TODO: https://github.com/kubernetes-csi/csi-release-tools/issues/39
+      - name: CSI_PROW_KIND_VERSION
+        value: "86bc23d84ac12dcb56a0528890736e2c347c2dc3"
       - name: CSI_PROW_KUBERNETES_VERSION
         value: "$actual"
       - name: CSI_PROW_BUILD_JOB