Merge pull request #67046 from liggitt/limit-libressl-check

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. move easyrsa check to gce prereq check fixes #67044 the check added in https://github.com/kubernetes/kubernetes/pull/66690 was broader than required... only paths that use easyrsa need to be so restrictive this restores local-up-cluster.sh on osx /assign @spiffxp ```release-note NONE ```

Merge pull request #67046 from liggitt/limit-libressl-check
4602f0e1 · Kubernetes Submit Queue · GitHub · db9545e6 · cc1a7735 · 4602f0e1
Unverified Commit 4602f0e1 authored Aug 07, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

util.sh cluster/gce/util.sh +9 -0

util.sh hack/lib/util.sh +0 -6

No files found.
--- 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

--- 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)