WIP: Go for Kubernetes fix

kubernetes-csi · Aug 14, 2020 · e56cf82 · e56cf82
1 parent 195c868
commit e56cf82
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/release-tools/prow.sh b/release-tools/prow.sh
@@ -222,6 +222,7 @@ configvar CSI_PROW_DRIVER_CANARY "${CSI_PROW_HOSTPATH_CANARY}" "driver image ove
 configvar CSI_PROW_E2E_VERSION_1_15 v1.15.0 "E2E version for Kubernetes 1.15.x"
 configvar CSI_PROW_E2E_VERSION_1_16 v1.16.0 "E2E version for Kubernetes 1.16.x"
 configvar CSI_PROW_E2E_VERSION_1_17 v1.17.0 "E2E version for Kubernetes 1.17.x"
+# configvar CSI_PROW_E2E_VERSION_1_18 v1.18.0 "E2E version for Kubernetes 1.18.x"
 # TODO: add new CSI_PROW_E2E_VERSION entry for future Kubernetes releases
 configvar CSI_PROW_E2E_VERSION_LATEST master "E2E version for Kubernetes master" # testing against Kubernetes master is already tracking a moving target, so we might as well use a moving E2E version
 configvar CSI_PROW_E2E_REPO_LATEST https://github.com/kubernetes/kubernetes "E2E repo for Kubernetes >= 1.13.x" # currently the same for all versions
@@ -513,6 +514,8 @@ go_version_for_kubernetes () (
     if ! [ "$go_version" ]; then
         die "Unable to determine Go version for Kubernetes $version from hack/lib/golang.sh."
     fi
+    # Strip the trailing .0. Kubernetes includes it, Go itself doesn't.
+    go_version="$(echo $go_version | sed -e 's/\.0$//')"
     echo "$go_version"
 )