hack/setup-envtest.sh: follow-up from kubernetes-sigs#1092

Author: joelanford

hack/check-everything.sh

@@ -32,14 +32,15 @@ kb_root_dir=$tmp_root/kubebuilder
 # machine, but rebuild the kubebuilder and kubebuilder-bin binaries.
 SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
 
+ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.16.4"}
 
 if [ -z "$SKIP_FETCH_TOOLS" ]; then
-  header_text "fetching envtest tools"
+  header_text "fetching envtest tools@${ENVTEST_K8S_VERSION}"
   fetch_envtest_tools "$kb_root_dir"
   fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
 fi
 
-header_text "setting up envtest environment"
+header_text "setting up envtest@${ENVTEST_K8S_VERSION}"
 setup_envtest_env "$kb_root_dir"
 
 ${hack_dir}/verify.sh

hack/setup-envtest.sh

@@ -14,32 +14,41 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
 function setup_envtest_env {
   # Setup env vars
+  KUBEBUILDER_ASSETS=${KUBEBUILDER_ASSETS:-""}
   if [[ -z "${KUBEBUILDER_ASSETS}" ]]; then
     export KUBEBUILDER_ASSETS=$1/bin
   fi
 }
 
 # fetch k8s API gen tools and make it available under envtest_root_dir/bin.
+#
+# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
+# in your environment to any value:
+#
+# $ SKIP_FETCH_TOOLS=1 ./check-everything.sh
+#
+# If you skip fetching tools, this script will use the tools already on your
+# machine.
 function fetch_envtest_tools {
+  if [ -n "$SKIP_FETCH_TOOLS" ]; then
+    return 0
+  fi
+
   tmp_root=/tmp
   envtest_root_dir=$tmp_root/envtest
 
-  k8s_version=1.16.4
-  goarch=amd64
-  goos="unknown"
-
-  if [[ "$OSTYPE" == "linux-gnu" ]]; then
-    goos="linux"
-  elif [[ "$OSTYPE" == "darwin"* ]]; then
-    goos="darwin"
-  fi
+  k8s_version="${ENVTEST_K8S_VERSION:-1.16.4}"
+  goarch="$(go env GOARCH)"
+  goos="$(go env GOOS)"
 
-  if [[ "$goos" == "unknown" ]]; then
-    echo "OS '$OSTYPE' not supported. Aborting." >&2
+  if [[ "$goos" != "linux" && "$goos" != "darwin" ]]; then
+    echo "OS '$goos' not supported. Aborting." >&2
     return 1
   fi