pkg/controller: Update the CRD testEnv field to use the CRD type

Update the CRD field to use the apiextensionsv1.CustomResourceDefinition
type instead of the client.Object interface. It looks like this change
was introduced during the sweep to k8s 1.22 bump:

kubernetes-sigs/controller-runtime@b5eeb71

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

pkg/controller/operators/openshift/suite_test.go

@@ -10,6 +10,7 @@ import (
 	. "github.com/onsi/gomega"
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/operator-framework/api/crds"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -54,8 +55,8 @@ var _ = BeforeSuite(func() {
 	base := filepath.Join("..", "..", "..", "..", "vendor", "github.com", "openshift", "api", "config", "v1")
 	testEnv = &envtest.Environment{
 		ErrorIfCRDPathMissing: true,
-		CRDs: []client.Object{
-			crds.ClusterServiceVersion(),
+		CRDs: []apiextensionsv1.CustomResourceDefinition{
+			*crds.ClusterServiceVersion(),
 		},
 		CRDDirectoryPaths: []string{
 			filepath.Join(base, "0000_00_cluster-version-operator_01_clusteroperator.crd.yaml"),

pkg/controller/operators/suite_test.go

@@ -88,14 +88,14 @@ var _ = BeforeSuite(func() {
 	useExisting := false
 	testEnv = &envtest.Environment{
 		UseExistingCluster: &useExisting,
-		CRDs: []client.Object{
-			crds.CatalogSource(),
-			crds.ClusterServiceVersion(),
-			crds.InstallPlan(),
-			crds.Subscription(),
-			crds.OperatorGroup(),
-			crds.Operator(),
-			crds.OperatorCondition(),
+		CRDs: []apiextensionsv1.CustomResourceDefinition{
+			*crds.CatalogSource(),
+			*crds.ClusterServiceVersion(),
+			*crds.InstallPlan(),
+			*crds.Subscription(),
+			*crds.OperatorGroup(),
+			*crds.Operator(),
+			*crds.OperatorCondition(),
 		},
 	}