fix: the CRD paths is only ../.. when is multigroup

kubernetes-sigs · Sep 16, 2020 · 02e2756 · 02e2756
1 parent f27fc18
commit 02e2756
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/pkg/plugin/v2/scaffolds/internal/templates/controller/controller_suitetest.go b/pkg/plugin/v2/scaffolds/internal/templates/controller/controller_suitetest.go
@@ -33,6 +33,9 @@ type SuiteTest struct {
 	file.MultiGroupMixin
 	file.BoilerplateMixin
 	file.ResourceMixin
+
+	// Define the Path for the CRD when it is multigroup
+	CRDDirectoryPaths string
 }
 
 // SetTemplateDefaults implements file.Template
@@ -51,6 +54,15 @@ func (f *SuiteTest) SetTemplateDefaults() error {
 		file.NewMarkerFor(f.Path, addSchemeMarker),
 	)
 
+	// If is multigroup the path needs to be ../../ since it has
+	// the group dir.
+	f.CRDDirectoryPaths = `".."`
+	if f.MultiGroup {
+		f.CRDDirectoryPaths = `"..", ".."`
+	}
+
+
+
 	return nil
 }
 
@@ -138,7 +150,7 @@ var _ = BeforeSuite(func(done Done) {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join({{ .CRDDirectoryPaths }}, "config", "crd", "bases")},
 	}
 
 	var err error

diff --git a/pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller_suitetest.go b/pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller_suitetest.go
@@ -33,6 +33,9 @@ type SuiteTest struct {
 	file.MultiGroupMixin
 	file.BoilerplateMixin
 	file.ResourceMixin
+
+	// Define the Path for the CRD when it is multigroup
+	CRDDirectoryPaths string
 }
 
 // SetTemplateDefaults implements file.Template
@@ -51,6 +54,15 @@ func (f *SuiteTest) SetTemplateDefaults() error {
 		file.NewMarkerFor(f.Path, addSchemeMarker),
 	)
 
+	// If is multigroup the path needs to be ../../ since it has
+	// the group dir.
+	f.CRDDirectoryPaths = `".."`
+	if f.MultiGroup {
+		f.CRDDirectoryPaths = `"..", ".."`
+	}
+
+
+
 	return nil
 }
 
@@ -138,7 +150,7 @@ var _ = BeforeSuite(func(done Done) {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join({{ .CRDDirectoryPaths }}, "config", "crd", "bases")},
 	}
 
 	var err error

diff --git a/testdata/project-v2-addon/controllers/suite_test.go b/testdata/project-v2-addon/controllers/suite_test.go
@@ -54,7 +54,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")},
 	}
 
 	var err error

diff --git a/testdata/project-v2/controllers/suite_test.go b/testdata/project-v2/controllers/suite_test.go
@@ -54,7 +54,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")},
 	}
 
 	var err error

diff --git a/testdata/project-v3-addon/controllers/suite_test.go b/testdata/project-v3-addon/controllers/suite_test.go
@@ -54,7 +54,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")},
 	}
 
 	var err error

diff --git a/testdata/project-v3/controllers/suite_test.go b/testdata/project-v3/controllers/suite_test.go
@@ -54,7 +54,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")},
 	}
 
 	var err error