From 3966c6775dfb86e6ce171c5673ae52c0724b2d9f Mon Sep 17 00:00:00 2001
From: k8s-infra-cherrypick-robot
 <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com>
Date: Tue, 17 May 2022 06:32:27 -0700
Subject: [PATCH] :bug: fix loading CRDs from multiple directories in envtests
 (#1905)

* fix loading CRDs from multiple directories in envtests

* add unit tests

Co-authored-by: Christoph Mewes <christoph@kubermatic.com>
---
 pkg/envtest/crd.go      | 13 +++++------
 pkg/envtest/crd_test.go | 51 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 pkg/envtest/crd_test.go

diff --git a/pkg/envtest/crd.go b/pkg/envtest/crd.go
index 0bec3c42ad..3b52ae8f99 100644
--- a/pkg/envtest/crd.go
+++ b/pkg/envtest/crd.go
@@ -278,12 +278,6 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1.CustomResourceDefin
 
 // renderCRDs iterate through options.Paths and extract all CRD files.
 func renderCRDs(options *CRDInstallOptions) ([]*apiextensionsv1.CustomResourceDefinition, error) {
-	var (
-		err   error
-		info  os.FileInfo
-		files []string
-	)
-
 	type GVKN struct {
 		GVK  schema.GroupVersionKind
 		Name string
@@ -292,7 +286,12 @@ func renderCRDs(options *CRDInstallOptions) ([]*apiextensionsv1.CustomResourceDe
 	crds := map[GVKN]*apiextensionsv1.CustomResourceDefinition{}
 
 	for _, path := range options.Paths {
-		var filePath = path
+		var (
+			err      error
+			info     os.FileInfo
+			files    []string
+			filePath = path
+		)
 
 		// Return the error if ErrorIfPathMissing exists
 		if info, err = os.Stat(path); os.IsNotExist(err) {
diff --git a/pkg/envtest/crd_test.go b/pkg/envtest/crd_test.go
new file mode 100644
index 0000000000..2c12ba57b4
--- /dev/null
+++ b/pkg/envtest/crd_test.go
@@ -0,0 +1,51 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package envtest
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/util/sets"
+)
+
+var _ = Describe("Test", func() {
+	Describe("readCRDFiles", func() {
+		It("should not mix up files from different directories", func() {
+			opt := CRDInstallOptions{
+				Paths: []string{
+					"testdata/crds",
+					"testdata/crdv1_original",
+				},
+			}
+			err := readCRDFiles(&opt)
+			Expect(err).NotTo(HaveOccurred())
+
+			expectedCRDs := sets.NewString(
+				"frigates.ship.example.com",
+				"configs.foo.example.com",
+				"drivers.crew.example.com",
+			)
+
+			foundCRDs := sets.NewString()
+			for _, crd := range opt.CRDs {
+				foundCRDs.Insert(crd.Name)
+			}
+
+			Expect(expectedCRDs).To(Equal(foundCRDs))
+		})
+	})
+})