Merge pull request #1092 from joelanford/setup-envtest

🏃 setup-envtest.sh: standalone script for setting up envtest

Author: k8s-ci-robot

hack/check-everything.sh

@@ -18,21 +18,7 @@ set -e
 
 hack_dir=$(dirname ${BASH_SOURCE})
 source ${hack_dir}/common.sh
-
-k8s_version=1.16.4
-goarch=amd64
-goos="unknown"
-
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-  goos="linux"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-  goos="darwin"
-fi
-
-if [[ "$goos" == "unknown" ]]; then
-  echo "OS '$OSTYPE' not supported. Aborting." >&2
-  exit 1
-fi
+source ${hack_dir}/setup-envtest.sh
 
 tmp_root=/tmp
 kb_root_dir=$tmp_root/kubebuilder
@@ -46,40 +32,15 @@ kb_root_dir=$tmp_root/kubebuilder
 # machine, but rebuild the kubebuilder and kubebuilder-bin binaries.
 SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
 
-# fetch k8s API gen tools and make it available under kb_root_dir/bin.
-function fetch_kb_tools {
-  local dest_dir="${1}"
-
-  # use the pre-existing version in the temporary folder if it matches our k8s version
-  if [[ -x "${dest_dir}/kubebuilder/bin/kube-apiserver" ]]; then
-    version=$("${dest_dir}"/kubebuilder/bin/kube-apiserver --version)
-    if [[ $version == *"${k8s_version}"* ]]; then
-      header_text "Using cached kubebuilder-tools from ${dest_dir}"
-      return 0
-    fi
-  fi
-
-  header_text "fetching tools (into '${dest_dir}')"
-  kb_tools_archive_name="kubebuilder-tools-$k8s_version-$goos-$goarch.tar.gz"
-  kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$kb_tools_archive_name"
-
-  kb_tools_archive_path="$tmp_root/$kb_tools_archive_name"
-  if [ ! -f $kb_tools_archive_path ]; then
-    curl -sL ${kb_tools_download_url} -o "$kb_tools_archive_path"
-  fi
-
-  mkdir -p "${dest_dir}"
-  tar -C "${dest_dir}" --strip-components=1 -zvxf "$kb_tools_archive_path"
-}
-
-header_text "using tools"
 
 if [ -z "$SKIP_FETCH_TOOLS" ]; then
-  fetch_kb_tools "$kb_root_dir"
-  fetch_kb_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
+  header_text "fetching envtest tools"
+  fetch_envtest_tools "$kb_root_dir"
+  fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
 fi
 
-setup_envs
+header_text "setting up envtest environment"
+setup_envtest_env "$kb_root_dir"
 
 ${hack_dir}/verify.sh
 ${hack_dir}/test-all.sh

hack/common.sh

@@ -51,12 +51,3 @@ fi
 function header_text {
   echo "$header$*$reset"
 }
-
-function setup_envs {
-  header_text "setting up env vars"
-
-  # Setup env vars
-  if [[ -z "${KUBEBUILDER_ASSETS}" ]]; then
-      export KUBEBUILDER_ASSETS=$kb_root_dir/bin
-  fi
-}

hack/setup-envtest.sh

@@ -0,0 +1,66 @@
+#!/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 -e
+
+function setup_envtest_env {
+  # Setup env vars
+  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.
+function fetch_envtest_tools {
+  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
+
+  if [[ "$goos" == "unknown" ]]; then
+    echo "OS '$OSTYPE' 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
+      return 0
+    fi
+  fi
+
+  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"
+}

hack/test-all.sh

@@ -18,8 +18,6 @@ set -e
 
 source $(dirname ${BASH_SOURCE})/common.sh
 
-setup_envs
-
 header_text "running go test"
 
 go test -race ${MOD_OPT} ./...