fix validating roundtripper scheme

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

pkg/controller/operators/catalog/operator.go

@@ -11,6 +11,8 @@ import (
 	"sync"
 	"time"
 
+	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
+
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/labeller"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/validatingroundtripper"
 	errorwrap "github.com/pkg/errors"
@@ -149,6 +151,8 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 	}
 
 	// create a config that validates we're creating objects with labels
+	_ = apiextensionsv1.AddToScheme(scheme)   // required by opClient
+	_ = apiregistrationv1.AddToScheme(scheme) // required by opClient
 	validatingConfig := validatingroundtripper.Wrap(config, scheme)
 
 	// Create a new client for dynamic types (CRs)

pkg/lib/operatorclient/client.go

@@ -172,25 +172,25 @@ func NewClientFromConfig(kubeconfig string, logger *logrus.Logger) ClientInterfa
 }
 
 func NewClientFromRestConfig(config *rest.Config) (client ClientInterface, err error) {
-	kubernetes, err := kubernetes.NewForConfig(config)
+	k8s, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		return
 	}
 
-	apiextensions, err := apiextensions.NewForConfig(config)
+	apiext, err := apiextensions.NewForConfig(config)
 	if err != nil {
 		return
 	}
 
-	apiregistration, err := apiregistration.NewForConfig(config)
+	apireg, err := apiregistration.NewForConfig(config)
 	if err != nil {
 		return
 	}
 
 	client = &Client{
-		kubernetes,
-		apiextensions,
-		apiregistration,
+		k8s,
+		apiext,
+		apireg,
 	}
 
 	return