Merge pull request #17921 from soltysh/glide_check

Automatic merge from submit-queue.

Check glide version

Same thing as in openshift/client-go#19

/assign @deads2k @stevekuznetsov

Author: openshift-merge-robot

Diff for: hack/lib/constants.sh

@@ -7,6 +7,8 @@ readonly OS_GO_PACKAGE=github.com/openshift/origin
 readonly OS_BUILD_ENV_GOLANG="${OS_BUILD_ENV_GOLANG:-1.9}"
 readonly OS_BUILD_ENV_IMAGE="${OS_BUILD_ENV_IMAGE:-openshift/origin-release:golang-${OS_BUILD_ENV_GOLANG}}"
 readonly OS_REQUIRED_GO_VERSION="go${OS_BUILD_ENV_GOLANG}"
+readonly OS_GLIDE_MINOR_VERSION="13"
+readonly OS_REQUIRED_GLIDE_VERSION="0.$OS_GLIDE_MINOR_VERSION"
 
 readonly OS_GOFLAGS_TAGS="include_gcs include_oss containers_image_openpgp"
 readonly OS_GOFLAGS_TAGS_LINUX_AMD64="gssapi"

Diff for: hack/lib/util/golang.sh

@@ -2,7 +2,7 @@
 #
 # This library holds golang related utility functions.
 
-# os::golang::verify_go_version ensure the go tool exists and is a viable version.
+# os::golang::verify_go_version ensures the go tool exists and is a viable version.
 function os::golang::verify_go_version() {
 	os::util::ensure::system_binary_exists 'go'
 
@@ -11,8 +11,7 @@ function os::golang::verify_go_version() {
 	if [[ "${go_version[2]}" < "${OS_REQUIRED_GO_VERSION}" ]]; then
 		os::log::info "Detected go version: ${go_version[*]}."
 		if [[ -z "${PERMISSIVE_GO:-}" ]]; then
-			os::log::warning "Please install Go version ${OS_REQUIRED_GO_VERSION} or use PERMISSIVE_GO=y to bypass this check."
-			return 0
+			os::log::fatal "Please install Go version ${OS_REQUIRED_GO_VERSION} or use PERMISSIVE_GO=y to bypass this check."
 		else
 			os::log::warning "Detected golang version doesn't match required Go version."
 			os::log::warning "This version mismatch could lead to differences in execution between this run and the CI systems."
@@ -21,3 +20,17 @@ function os::golang::verify_go_version() {
 	fi
 }
 readonly -f os::golang::verify_go_version
+
+# os::golang::verify_glide_version ensures the glide is at the required level
+function os::golang::verify_glide_version() {
+	os::util::ensure::system_binary_exists 'glide'
+
+	local glide_version
+	glide_version=($(glide --version))
+	if ! echo "${glide_version[2]#v}" | awk -F. -v min=$OS_GLIDE_MINOR_VERSION '{ exit $2 < min }'; then
+		os::log::info "Detected glide version: ${glide_version[*]}."
+		os::log::fatal "Please install Glide version ${OS_REQUIRED_GLIDE_VERSION} or newer."
+	fi
+
+}
+readonly -f os::golang::verify_glide_version

Diff for: hack/update-deps.sh

@@ -7,6 +7,8 @@ set -o pipefail
 cd "$(dirname "${BASH_SOURCE}")/.."
 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
+os::golang::verify_glide_version
+
 # fail early if any of the staging dirs is checked out
 for pkg in "$GOPATH/src/k8s.io/kubernetes/staging/src/k8s.io/"*; do
   dir=$(basename $pkg)