test: fix build issues in integration tests

Signed-off-by: Manan Gupta <[email protected]>

test/integration/framework/fixture.go

@@ -25,9 +25,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/yaml"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
@@ -57,22 +59,18 @@ func NewFixture(ctx context.Context, t *testing.T) *Fixture {
 	config := ApiserverConfig()
 
 	scheme, err := controllermanager.NewScheme()
-	if err != nil {
-		t.Fatalf("can't create Scheme: %v", err)
-	}
+	require.NoError(t, err)
 
-	mapper, err := apiutil.NewDiscoveryRESTMapper(config)
-	if err != nil {
-		t.Fatalf("can't create Mapper: %v", err)
-	}
+	httpClient, err := rest.HTTPClientFor(config)
+	require.NoError(t, err)
+	mapper, err := apiutil.NewDiscoveryRESTMapper(config, httpClient)
+	require.NoError(t, err)
 
 	kubeClient, err := client.New(config, client.Options{
 		Scheme: scheme,
 		Mapper: mapper,
 	})
-	if err != nil {
-		t.Fatalf("can't create Client: %v", err)
-	}
+	require.NoError(t, err)
 
 	return &Fixture{
 		T:      t,

test/integration/framework/main.go

@@ -31,6 +31,7 @@ import (
 	"time"
 
 	"k8s.io/klog"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"planetscale.dev/vitess-operator/pkg/operator/controllermanager"
@@ -204,7 +205,11 @@ func testMain(tests func() int) error {
 
 	// Start vitess-operator in this test process.
 	mgr, err := controllermanager.New("", ApiserverConfig(), manager.Options{
-		Namespace: "default",
+		Cache: cache.Options{
+			DefaultNamespaces: map[string]cache.Config{
+				"default": {},
+			},
+		},
 	})
 	if err != nil {
 		return fmt.Errorf("cannot create controller-manager: %v", err)
@@ -246,8 +251,8 @@ func execKubectlStdin(stdin io.Reader, args ...string) ([]byte, error) {
 		"--tls-server-name", "10.0.0.1",
 		"--certificate-authority", ApiserverCert(),
 		"--token", ApiserverToken(),
-		}, args...)
-	
+	}, args...)
+
 	cmd := exec.Command(execPath, cmdline...)
 	cmd.Stdin = stdin
 	return cmd.CombinedOutput()