Merge pull request #706 from hasheddan/setcrds

k8s-ci-robot · web-flow · commit 288b0414ce06 · 2019-12-03T11:24:58.000-08:00
✨ envtest: surface merged crds
diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go
@@ -240,7 +240,8 @@ func (te *Environment) Start() (*rest.Config, error) {
 	log.V(1).Info("installing CRDs")
 	te.CRDInstallOptions.CRDs = mergeCRDs(te.CRDInstallOptions.CRDs, te.CRDs)
 	te.CRDInstallOptions.Paths = mergePaths(te.CRDInstallOptions.Paths, te.CRDDirectoryPaths)
-	_, err := InstallCRDs(te.Config, te.CRDInstallOptions)
+	crds, err := InstallCRDs(te.Config, te.CRDInstallOptions)
+	te.CRDs = crds
 	return te.Config, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,8 @@ func (te Environment) Start() (rest.Config, error) {`
`240`	`240`	`log.V(1).Info("installing CRDs")`
`241`	`241`	`te.CRDInstallOptions.CRDs = mergeCRDs(te.CRDInstallOptions.CRDs, te.CRDs)`
`242`	`242`	`te.CRDInstallOptions.Paths = mergePaths(te.CRDInstallOptions.Paths, te.CRDDirectoryPaths)`
`243`		`- _, err := InstallCRDs(te.Config, te.CRDInstallOptions)`
	`243`	`+ crds, err := InstallCRDs(te.Config, te.CRDInstallOptions)`
	`244`	`+ te.CRDs = crds`
`244`	`245`	`return te.Config, err`
`245`	`246`	`}`
`246`	`247`