Merge pull request vmware-tanzu#67 from bryanv/bryanv/provide-default-assets-dir

bryanv · web-flow · commit d871a14d6853 · 2023-02-24T10:55:33.000-06:00
Set default envtest binary asset directory
diff --git a/test/builder/test_suite.go b/test/builder/test_suite.go
@@ -29,7 +29,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/rest"
-	klog "k8s.io/klog/v2"
+	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -224,7 +224,8 @@ func (s *TestSuite) init(crdPaths []string) {
 
 	if s.flags.IntegrationTestsEnabled {
 		s.envTest = envtest.Environment{
-			CRDDirectoryPaths: crdPaths,
+			CRDDirectoryPaths:     crdPaths,
+			BinaryAssetsDirectory: filepath.Join(testutil.GetRootDirOrDie(), "hack", "tools", "bin"),
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`30`	`30`	`"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"`
`31`	`31`	`"k8s.io/client-go/rest"`
`32`		`- klog "k8s.io/klog/v2"`
	`32`	`+ "k8s.io/klog/v2"`
`33`	`33`	`"k8s.io/klog/v2/klogr"`
`34`	`34`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`35`	`35`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
`@@ -224,7 +224,8 @@ func (s *TestSuite) init(crdPaths []string) {`
`224`	`224`
`225`	`225`	`if s.flags.IntegrationTestsEnabled {`
`226`	`226`	`s.envTest = envtest.Environment{`
`227`		`- CRDDirectoryPaths: crdPaths,`
	`227`	`+ CRDDirectoryPaths: crdPaths,`
	`228`	`+ BinaryAssetsDirectory: filepath.Join(testutil.GetRootDirOrDie(), "hack", "tools", "bin"),`
`228`	`229`	`}`
`229`	`230`	`}`
`230`	`231`	`}`