Merge pull request #65 from pwittrock/operator

Don't fail envtest if directory is missing

Author: k8s-ci-robot

pkg/envtest/crd.go

@@ -39,6 +39,9 @@ type CRDInstallOptions struct {
 	// CRDs is a list of CRDs to install
 	CRDs []*apiextensionsv1beta1.CustomResourceDefinition
 
+	// ErrorIfPathMissing will cause an error if a Path does not exist
+	ErrorIfPathMissing bool
+
 	// maxTime is the max time to wait
 	maxTime time.Duration
 
@@ -75,6 +78,9 @@ func InstallCRDs(config *rest.Config, options CRDInstallOptions) ([]*apiextensio
 func readCRDFiles(options *CRDInstallOptions) error {
 	if len(options.Paths) > 0 {
 		for _, path := range options.Paths {
+			if _, err := os.Stat(path); !options.ErrorIfPathMissing && os.IsNotExist(err) {
+				continue
+			}
 			new, err := readCRDs(path)
 			if err != nil {
 				return err

pkg/envtest/envtest_test.go

@@ -84,8 +84,15 @@ var _ = Describe("Test", func() {
 			close(done)
 		}, 5)
 
-		It("should return an error if the directory doesn't exist", func(done Done) {
+		It("should not return an not error if the directory doesn't exist", func(done Done) {
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{Paths: []string{"fake"}})
+			Expect(err).NotTo(HaveOccurred())
+
+			close(done)
+		}, 5)
+
+		It("should return an error if the directory doesn't exist", func(done Done) {
+			crds, err = InstallCRDs(env.Config, CRDInstallOptions{Paths: []string{"fake"}, ErrorIfPathMissing: true})
 			Expect(err).To(HaveOccurred())
 
 			close(done)