Merge pull request #17589 from openshift-cherrypick-robot/cherry-pick-17577-to-release-3.8

Automatic merge from submit-queue.

Automated cherry-pick of #17577 on release-3.8

This is an automated cherry-pick of #17577

/assign smarterclayton

Author: openshift-merge-robot

test/extended/conformance-k8s.sh

@@ -43,9 +43,11 @@ To recreate these results
 Nightly conformance tests are run against release branches and reported https://openshift-gce-devel.appspot.com/builds/origin-ci-test/logs/test_branch_origin_extended_conformance_k8s/
 END
 
-version="${KUBERNETES_VERSION:-release-1.7}"
+version="${KUBERNETES_VERSION:-release-1.8}"
 kubernetes="${KUBERNETES_ROOT:-${OS_ROOT}/../../../k8s.io/kubernetes}"
-if [[ ! -d "${kubernetes}" ]]; then
+if [[ -d "${kubernetes}" ]]; then
+  git fetch origin --tags
+else
   if [[ -n "${KUBERNETES_ROOT-}" ]]; then
     os::log::fatal "Cannot find Kubernetes source directory, set KUBERNETES_ROOT"
   fi