Merge pull request #431 from droot/bugfix-envtest-multiversion-fix

:bugfix: support multiversion CRD in envtest

Author: k8s-ci-robot

pkg/envtest/crd.go

@@ -110,13 +110,24 @@ func WaitForCRDs(config *rest.Config, crds []*apiextensionsv1beta1.CustomResourc
 	// Add each CRD to a map of GroupVersion to Resource
 	waitingFor := map[schema.GroupVersion]*sets.String{}
 	for _, crd := range crds {
-		gv := schema.GroupVersion{Group: crd.Spec.Group, Version: crd.Spec.Version}
-		if _, found := waitingFor[gv]; !found {
-			// Initialize the set
-			waitingFor[gv] = &sets.String{}
+		gvs := []schema.GroupVersion{}
+		if crd.Spec.Version != "" {
+			gvs = append(gvs, schema.GroupVersion{Group: crd.Spec.Group, Version: crd.Spec.Version})
+		}
+		for _, ver := range crd.Spec.Versions {
+			if ver.Served {
+				gvs = append(gvs, schema.GroupVersion{Group: crd.Spec.Group, Version: ver.Name})
+			}
+		}
+		for _, gv := range gvs {
+			log.V(1).Info("adding API in waitlist", "GV", gv)
+			if _, found := waitingFor[gv]; !found {
+				// Initialize the set
+				waitingFor[gv] = &sets.String{}
+			}
+			// Add the Resource
+			waitingFor[gv].Insert(crd.Spec.Names.Plural)
 		}
-		// Add the Resource
-		waitingFor[gv].Insert(crd.Spec.Names.Plural)
 	}
 
 	// Poll until all resources are found in discovery
@@ -225,7 +236,7 @@ func readCRDs(path string) ([]*apiextensionsv1beta1.CustomResourceDefinition, er
 			crds = append(crds, crd)
 		}
 
-		log.V(1).Info("read CRDs from file", "file", file)
+		log.V(1).Info("read CRDs from file", "file", file.Name())
 	}
 	return crds, nil
 }

pkg/envtest/envtest_test.go

@@ -18,6 +18,7 @@ package envtest
 
 import (
 	"context"
+	"path/filepath"
 
 	"time"
 
@@ -60,7 +61,7 @@ var _ = Describe("Test", func() {
 		It("should install the CRDs into the cluster", func(done Done) {
 
 			crds, err = InstallCRDs(env.Config, CRDInstallOptions{
-				Paths: []string{"."},
+				Paths: []string{filepath.Join(".", "testdata")},
 			})
 			Expect(err).NotTo(HaveOccurred())
 
@@ -86,6 +87,11 @@ var _ = Describe("Test", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(crd.Spec.Names.Kind).To(Equal("FirstMate"))
 
+			crd = &v1beta1.CustomResourceDefinition{}
+			err = c.Get(context.TODO(), types.NamespacedName{Name: "drivers.crew.example.com"}, crd)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(crd.Spec.Names.Kind).To(Equal("Driver"))
+
 			err = WaitForCRDs(env.Config, []*v1beta1.CustomResourceDefinition{
 				{
 					Spec: v1beta1.CustomResourceDefinitionSpec{
@@ -118,7 +124,27 @@ var _ = Describe("Test", func() {
 						Names: v1beta1.CustomResourceDefinitionNames{
 							Plural: "firstmates",
 						}},
-				}},
+				},
+				{
+					Spec: v1beta1.CustomResourceDefinitionSpec{
+						Group: "crew.example.com",
+						Names: v1beta1.CustomResourceDefinitionNames{
+							Plural: "drivers",
+						},
+						Versions: []v1beta1.CustomResourceDefinitionVersion{
+							{
+								Name:    "v1",
+								Storage: true,
+								Served:  true,
+							},
+							{
+								Name:    "v2",
+								Storage: false,
+								Served:  true,
+							},
+						}},
+				},
+			},
 				CRDInstallOptions{maxTime: 50 * time.Millisecond, pollInterval: 15 * time.Millisecond},
 			)
 			Expect(err).NotTo(HaveOccurred())
@@ -145,9 +171,11 @@ var _ = Describe("Test", func() {
 			err := WaitForCRDs(env.Config,
 				[]*v1beta1.CustomResourceDefinition{
 					{
-						Spec: v1beta1.CustomResourceDefinitionSpec{Names: v1beta1.CustomResourceDefinitionNames{
-							Plural: "notfound",
-						}},
+						Spec: v1beta1.CustomResourceDefinitionSpec{
+							Version: "v1",
+							Names: v1beta1.CustomResourceDefinitionNames{
+								Plural: "notfound",
+							}},
 					},
 				},
 				CRDInstallOptions{maxTime: 50 * time.Millisecond, pollInterval: 15 * time.Millisecond},