fixup! Add operator upgrade tests

internal/controllers/operator_controller_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"path/filepath"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -17,15 +16,13 @@ import (
 	"github.com/stretchr/testify/require"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
 	operatorsv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
 	"github.com/operator-framework/operator-controller/internal/catalogmetadata"
@@ -1057,27 +1054,6 @@ func verifyConditionsInvariants(op *operatorsv1alpha1.Operator) {
 }
 
 func TestOperatorUpgrade(t *testing.T) {
-	// bootstrapping test environment
-	var err error
-	testEnv := &envtest.Environment{
-		CRDDirectoryPaths: []string{
-			filepath.Join("..", "..", "config", "crd", "bases"),
-			filepath.Join("..", "..", "testdata", "crds")},
-		ErrorIfCRDPathMissing: true,
-	}
-
-	cfg, err = testEnv.Start()
-	require.NoError(t, err)
-	assert.NotNil(t, cfg)
-
-	sch = runtime.NewScheme()
-	require.NoError(t, operatorsv1alpha1.AddToScheme(sch))
-	require.NoError(t, rukpakv1alpha1.AddToScheme(sch))
-
-	cl, err = client.New(cfg, client.Options{Scheme: sch})
-	require.NoError(t, err)
-	assert.NotNil(t, cl)
-
 	ctx := context.Background()
 	fakeCatalogClient := testutil.NewFakeCatalogClient(testBundleList)
 	reconciler := &controllers.OperatorReconciler{
@@ -1106,7 +1082,7 @@ func TestOperatorUpgrade(t *testing.T) {
 			},
 		}
 		// Create an operator
-		err = cl.Create(ctx, operator)
+		err := cl.Create(ctx, operator)
 		require.NoError(t, err)
 
 		// Run reconcile
@@ -1199,7 +1175,7 @@ func TestOperatorUpgrade(t *testing.T) {
 			},
 		}
 		// Create an operator
-		err = cl.Create(ctx, operator)
+		err := cl.Create(ctx, operator)
 		require.NoError(t, err)
 
 		// Run reconcile