From cc1a7735e81a47c02fabadf1c6a2a7384e673c3e Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Mon, 6 Aug 2018 19:56:10 -0400
Subject: [PATCH] move easyrsa check to gce prereq check

---
 cluster/gce/util.sh | 9 +++++++++
 hack/lib/util.sh    | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 8be12edd484..6bc22de9bbe 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -113,6 +113,15 @@ function verify-prereqs() {
   # we use openssl to generate certs
   kube::util::test_openssl_installed
 
+  # ensure a version supported by easyrsa is installed
+  if [ "$(openssl version | cut -d\  -f1)" == "LibreSSL" ]; then
+    echo "LibreSSL is not supported. Please ensure openssl points to an OpenSSL binary"
+    if [ "$(uname -s)" == "Darwin" ]; then
+      echo 'On macOS we recommend using homebrew and adding "$(brew --prefix openssl)/bin" to your PATH'
+    fi
+    exit 1
+  fi
+
   # we use gcloud to create the cluster, gsutil to stage binaries and data
   for cmd in gcloud gsutil; do
     if ! which "${cmd}" >/dev/null; then
diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index 1d2f714a49d..a24b1093591 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -539,12 +539,6 @@ function kube::util::test_openssl_installed {
     if [ "$?" != "0" ]; then
       echo "Failed to run openssl. Please ensure openssl is installed"
       exit 1
-    elif [ "$(openssl version | cut -d\  -f1)" == "LibreSSL" ]; then
-      echo "LibreSSL is not supported. Please ensure openssl points to an OpenSSL binary"
-      if [ "$(uname -s)" == "Darwin" ]; then
-        echo 'On macOS we recommend using homebrew and adding "$(brew --prefix openssl)/bin" to your PATH'
-      fi
-      exit 1
     fi
 
     OPENSSL_BIN=$(command -v openssl)