surface error rather than panic in the validatingroundtripper

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

Author: Per Goncalves da Silva

pkg/controller/operators/catalog/operator.go

@@ -11,8 +11,6 @@ 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"
@@ -151,8 +149,6 @@ 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/controller/operators/validatingroundtripper/validating_round_tripper.go

@@ -49,31 +49,29 @@ func (rt *validatingRoundTripper) decodeProtobuf(body io.Reader) (*unstructured.
 	return &unstructured.Unstructured{Object: unstructuredObj}, nil
 }
 
-func (rt *validatingRoundTripper) decodeRequestBody(req *http.Request) *unstructured.Unstructured {
+func (rt *validatingRoundTripper) decodeRequestBody(req *http.Request) (*unstructured.Unstructured, error) {
 	b, err := req.GetBody()
 	if err != nil {
 		panic(fmt.Errorf("failed to get request body: %w", err))
 	}
 	defer b.Close()
 
-	var unstructuredObject *unstructured.Unstructured
 	switch req.Header.Get("Content-Type") {
 	case "application/vnd.kubernetes.protobuf":
-		unstructuredObject, err = rt.decodeProtobuf(b)
+		return rt.decodeProtobuf(b)
 	default:
-		unstructuredObject, err = rt.decodeYAMLOrJSON(b)
+		return rt.decodeYAMLOrJSON(b)
 	}
-
-	if err != nil {
-		panic(fmt.Errorf("failed to decode request body: %w", err))
-	}
-
-	return unstructuredObject
 }
 
 func (rt *validatingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	if req.Method == "POST" {
-		unstructuredObject := rt.decodeRequestBody(req)
+		unstructuredObject, err := rt.decodeRequestBody(req)
+
+		if err != nil {
+			return nil, err
+		}
+
 		gvk := unstructuredObject.GroupVersionKind()
 		if gvk.Kind != "Event" {
 			labels := unstructuredObject.GetLabels()