Skip to content

Commit

Permalink
🐛 fix loading CRDs from multiple directories in envtests (#1905)
Browse files Browse the repository at this point in the history
* fix loading CRDs from multiple directories in envtests

* add unit tests

Co-authored-by: Christoph Mewes <[email protected]>
  • Loading branch information
k8s-infra-cherrypick-robot and xrstf authored May 17, 2022
1 parent 2f77235 commit 3966c67
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 7 deletions.
13 changes: 6 additions & 7 deletions pkg/envtest/crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down
51 changes: 51 additions & 0 deletions pkg/envtest/crd_test.go
Original file line number Diff line number Diff line change
@@ -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))
})
})
})

0 comments on commit 3966c67

Please sign in to comment.