Make it easier to set test assets.

Add a single environment variable that can be set to change the default
search path for kubebuilder test assets, `KUBEBUILDER_ASSETS`.  This
prevents us from having to specify all three `TEST_ASSET_<thing>`
environment variables manually if kubebuilder isn't installed in
/usr/local/kubebuilder.

Author: DirectXMan12

pkg/envtest/server.go

@@ -18,6 +18,7 @@ package envtest
 
 import (
 	"os"
+	"path/filepath"
 
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/client-go/rest"
@@ -26,14 +27,24 @@ import (
 
 // Default binary path for test framework
 const (
-	envKubeAPIServerBin     = "TEST_ASSET_KUBE_APISERVER"
-	envEtcdBin              = "TEST_ASSET_ETCD"
-	defaultKubeAPIServerBin = "/usr/local/kubebuilder/bin/kube-apiserver"
-	defaultEtcdBin          = "/usr/local/kubebuilder/bin/etcd"
-	StartTimeout            = 60
-	StopTimeout             = 60
+	envKubeAPIServerBin    = "TEST_ASSET_KUBE_APISERVER"
+	envEtcdBin             = "TEST_ASSET_ETCD"
+	envKubectlBin          = "TEST_ASSET_KUBECTL"
+	envKubebuilderPath     = "KUBEBUILDER_ASSETS"
+	defaultKubebuilderPath = "/usr/local/kubebuilder/bin"
+	StartTimeout           = 60
+	StopTimeout            = 60
 )
 
+func defaultAssetPath(binary string) string {
+	assetPath := os.Getenv(envKubebuilderPath)
+	if assetPath == "" {
+		assetPath = defaultKubebuilderPath
+	}
+	return filepath.Join(assetPath, binary)
+
+}
+
 // APIServerDefaultArgs are flags necessary to bring up apiserver.
 // TODO: create test framework interface to append flag to default flags.
 var defaultKubeAPIServerFlags = []string{
@@ -71,10 +82,16 @@ func (te *Environment) Start() (*rest.Config, error) {
 	te.ControlPlane = integration.ControlPlane{}
 	te.ControlPlane.APIServer = &integration.APIServer{Args: defaultKubeAPIServerFlags}
 	if os.Getenv(envKubeAPIServerBin) == "" {
-		te.ControlPlane.APIServer.Path = defaultKubeAPIServerBin
+		te.ControlPlane.APIServer.Path = defaultAssetPath("kube-apiserver")
 	}
 	if os.Getenv(envEtcdBin) == "" {
-		te.ControlPlane.Etcd = &integration.Etcd{Path: defaultEtcdBin}
+		te.ControlPlane.Etcd = &integration.Etcd{Path: defaultAssetPath("etcd")}
+	}
+	if os.Getenv(envKubectlBin) == "" {
+		// we can't just set the path manually (it's behind a function), so set the environment variable instead
+		if err := os.Setenv(envKubectlBin, defaultAssetPath("kubectl")); err != nil {
+			return nil, err
+		}
 	}
 
 	// Start the control plane - retry if it fails

test.sh

@@ -90,9 +90,7 @@ function setup_envs {
   header_text "setting up env vars"
 
   # Setup env vars
-  export TEST_ASSET_KUBECTL=$kb_root_dir/bin/kubectl
-  export TEST_ASSET_KUBE_APISERVER=$kb_root_dir/bin/kube-apiserver
-  export TEST_ASSET_ETCD=$kb_root_dir/bin/etcd
+  export KUBEBUILDER_ASSETS=$kb_root_dir/bin
 }
 
 header_text "using tools"