From 334c702514b3efb3a2203d1699cf164cf9273052 Mon Sep 17 00:00:00 2001
From: Solly Ross <sollyross@google.com>
Date: Wed, 21 Apr 2021 00:08:43 -0700
Subject: [PATCH] Switch hack to use the new envtest tool

We can now drop the `setup-envtest.sh` script, and instead just use
`source <(setup-envtest fetch -k ${version} -p env)` (plus a couple
lines to install setup-envtest ;-)).
---
 hack/check-everything.sh | 19 ++++++--
 hack/setup-envtest.sh    | 96 ----------------------------------------
 2 files changed, 15 insertions(+), 100 deletions(-)
 delete mode 100755 hack/setup-envtest.sh

diff --git a/hack/check-everything.sh b/hack/check-everything.sh
index a444f6206b..f0367ac17f 100755
--- a/hack/check-everything.sh
+++ b/hack/check-everything.sh
@@ -20,16 +20,27 @@ set -o pipefail
 
 hack_dir=$(dirname ${BASH_SOURCE})
 source ${hack_dir}/common.sh
-source ${hack_dir}/setup-envtest.sh
 
 tmp_root=/tmp
 kb_root_dir=$tmp_root/kubebuilder
 
 ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.19.2"}
 
-fetch_envtest_tools "$kb_root_dir"
-fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
-setup_envtest_env "$kb_root_dir"
+# set up envtest tools if necessary
+
+header_text "installing envtest tools@${ENVTEST_K8S_VERSION} with setup-envtest if necessary"
+tmp_bin=/tmp/cr-tests-bin
+(
+    # don't presume to install for the user
+    cd ${hack_dir}/../tools/setup-envtest
+    GOBIN=${tmp_bin} go install .
+)
+source <(${tmp_bin}/setup-envtest use --use-env -p env ${ENVTEST_K8S_VERSION})
+
+# link the assets into integration
+for tool in kube-apiserver etcd kubectl; do
+    ln -f -s "${KUBEBUILDER_ASSETS:?unable find envtest assets}/${tool}" "${hack_dir}/../pkg/internal/testing/integration/assets/bin/${tool}"
+done
 
 ${hack_dir}/verify.sh
 ${hack_dir}/test-all.sh
diff --git a/hack/setup-envtest.sh b/hack/setup-envtest.sh
deleted file mode 100755
index dbbd206352..0000000000
--- a/hack/setup-envtest.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-#  Copyright 2020 The Kubernetes Authors.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-set -o errexit
-set -o pipefail
-
-# Turn colors in this script off by setting the NO_COLOR variable in your
-# environment to any value:
-#
-# $ NO_COLOR=1 test.sh
-NO_COLOR=${NO_COLOR:-""}
-if [ -z "$NO_COLOR" ]; then
-  header=$'\e[1;33m'
-  reset=$'\e[0m'
-else
-  header=''
-  reset=''
-fi
-
-function header_text {
-  echo "$header$*$reset"
-}
-
-function setup_envtest_env {
-  header_text "setting up env vars"
-
-  # 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 {
-  SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
-  if [ -n "$SKIP_FETCH_TOOLS" ]; then
-    return 0
-  fi
-
-  tmp_root=/tmp
-  envtest_root_dir=$tmp_root/envtest
-
-  k8s_version="${ENVTEST_K8S_VERSION:-1.19.2}"
-  goarch="$(go env GOARCH)"
-  goos="$(go env GOOS)"
-
-  if [[ ("$goos" != "linux" && "$goos" != "darwin") || ("$goos" == "darwin" && "$goarch" != "amd64") ]]; then
-    echo "OS '$goos' with '$goarch' arch is not supported. Aborting." >&2
-    return 1
-  fi
-
-  local dest_dir="${1}"
-
-  # use the pre-existing version in the temporary folder if it matches our k8s version
-  if [[ -x "${dest_dir}/bin/kube-apiserver" ]]; then
-    version=$("${dest_dir}"/bin/kube-apiserver --version)
-    if [[ $version == *"${k8s_version}"* ]]; then
-      header_text "Using cached envtest tools from ${dest_dir}"
-      return 0
-    fi
-  fi
-
-  header_text "fetching envtest tools@${k8s_version} (into '${dest_dir}')"
-  envtest_tools_archive_name="kubebuilder-tools-$k8s_version-$goos-$goarch.tar.gz"
-  envtest_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$envtest_tools_archive_name"
-
-  envtest_tools_archive_path="$tmp_root/$envtest_tools_archive_name"
-  if [ ! -f $envtest_tools_archive_path ]; then
-    curl -sL ${envtest_tools_download_url} -o "$envtest_tools_archive_path"
-  fi
-
-  mkdir -p "${dest_dir}"
-  tar -C "${dest_dir}" --strip-components=1 -zvxf "$envtest_tools_archive_path"
-}