Merge pull request #11813 from stevekuznetsov/skuznets/util-cleanup

Merged by openshift-bot

Author: OpenShift Bot

hack/lib/util/misc.sh

@@ -209,4 +209,19 @@ function os::util::curl_etcd() {
 
 	curl --fail --silent --cacert "${ca_bundle}" \
 	     --cert "${etcd_client_cert}" --key "${etcd_client_key}" "${full_url}"
-}
+}
+
+# os::util::host_platform determines what the host OS and architecture
+# are, as Golang sees it. The go tool chain does some slightly different
+# things when the target platform matches the host platform.
+#
+# Globals:
+#  None
+# Arguments:
+#  None
+# Returns:
+#  None
+function os::util::host_platform() {
+	echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
+}
+readonly -f os::util::host_platform

hack/util.sh

@@ -38,12 +38,6 @@ function kill_all_processes() {
 }
 readonly -f kill_all_processes
 
-# time_now return the time since the epoch in millis
-function time_now() {
-	echo $(date +%s000)
-}
-readonly -f time_now
-
 # dump_container_logs writes container logs to $LOG_DIR
 function dump_container_logs() {
 	if ! docker version >/dev/null 2>&1; then
@@ -201,11 +195,4 @@ function find_files() {
 		\) -prune \
 	\) -name '*.go' | sort -u
 }
-readonly -f find_files
-
-# Asks golang what it thinks the host platform is.  The go tool chain does some
-# slightly different things when the target platform matches the host platform.
-function os::util::host_platform() {
-	echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
-}
-readonly -f os::util::host_platform
+readonly -f find_files