Merge pull request #734 from droot/bugfix/crd-dir-path-ctrl-suite

k8s-ci-robot · web-flow · commit 4737157e7313 · 2019-05-23T10:42:27.000-07:00
:bugfix: fixed path-to-crd-dir in controller test suite
diff --git a/pkg/scaffold/v2/controller_suitetest.go b/pkg/scaffold/v2/controller_suitetest.go
@@ -101,7 +101,7 @@ var _ = BeforeSuite(func(done Done) {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
 	}
 	
 	cfg, err := testEnv.Start()

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ var _ = BeforeSuite(func(done Done) {`
`101`	`101`
`102`	`102`	`By("bootstrapping test environment")`
`103`	`103`	`testEnv = &envtest.Environment{`
`104`		`- CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},`
	`104`	`+ CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`cfg, err := testEnv.Start()`