fix tests

Author: sbueringer

controllers/clustercache/cluster_cache_fake.go

@@ -0,0 +1,39 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package clustercache
+
+import (
+	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// NewFakeClusterCache creates a new fake ClusterCache that can be used by unit tests.
+func NewFakeClusterCache(workloadClient client.Client, clusterKey client.ObjectKey, watchObjects ...string) ClusterCache {
+	testCacheTracker := &clusterCache{
+		clusterAccessors: make(map[client.ObjectKey]*clusterAccessor),
+	}
+
+	testCacheTracker.clusterAccessors[clusterKey] = &clusterAccessor{
+		lockedState: clusterAccessorLockedState{
+			connection: &clusterAccessorLockedConnectionState{
+				cachedClient: workloadClient,
+				watches:      sets.Set[string]{}.Insert(watchObjects...),
+			},
+		},
+	}
+	return testCacheTracker
+}

internal/controllers/machine/machine_controller_test.go

@@ -22,27 +22,24 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-logr/logr"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/api/v1beta1/index"
-	"sigs.k8s.io/cluster-api/controllers/remote"
+	"sigs.k8s.io/cluster-api/controllers/clustercache"
 	"sigs.k8s.io/cluster-api/internal/controllers/machine/drain"
 	"sigs.k8s.io/cluster-api/internal/test/builder"
 	"sigs.k8s.io/cluster-api/internal/util/ssa"
@@ -914,7 +911,7 @@ func TestReconcileRequest(t *testing.T) {
 
 			r := &Reconciler{
 				Client:       clientFake,
-				ClusterCache: remote.NewTestClusterCacheTracker(logr.New(log.NullLogSink{}), clientFake, clientFake, scheme.Scheme, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
+				ClusterCache: clustercache.NewFakeClusterCache(clientFake, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
 				ssaCache:     ssa.NewCache(),
 			}
 
@@ -1194,7 +1191,7 @@ func TestMachineConditions(t *testing.T) {
 			r := &Reconciler{
 				Client:       clientFake,
 				recorder:     record.NewFakeRecorder(10),
-				ClusterCache: remote.NewTestClusterCacheTracker(logr.New(log.NullLogSink{}), clientFake, clientFake, scheme.Scheme, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
+				ClusterCache: clustercache.NewFakeClusterCache(clientFake, client.ObjectKey{Name: testCluster.Name, Namespace: testCluster.Namespace}),
 				ssaCache:     ssa.NewCache(),
 			}
 
@@ -1650,10 +1647,9 @@ func TestDrainNode(t *testing.T) {
 				WithObjects(remoteObjs...).
 				Build()
 
-			tracker := remote.NewTestClusterCacheTracker(ctrl.Log, c, remoteClient, fakeScheme, client.ObjectKeyFromObject(testCluster))
 			r := &Reconciler{
 				Client:       c,
-				ClusterCache: tracker,
+				ClusterCache: clustercache.NewFakeClusterCache(remoteClient, client.ObjectKeyFromObject(testCluster)),
 				drainCache:   drain.NewCache(),
 			}
 
@@ -1749,11 +1745,10 @@ func TestDrainNode_withCaching(t *testing.T) {
 		WithObjects(remoteObjs...).
 		Build()
 
-	tracker := remote.NewTestClusterCacheTracker(ctrl.Log, c, remoteClient, fakeScheme, client.ObjectKeyFromObject(testCluster))
 	drainCache := drain.NewCache()
 	r := &Reconciler{
 		Client:       c,
-		ClusterCache: tracker,
+		ClusterCache: clustercache.NewFakeClusterCache(remoteClient, client.ObjectKeyFromObject(testCluster)),
 		drainCache:   drainCache,
 	}
 
@@ -2050,10 +2045,9 @@ func TestShouldWaitForNodeVolumes(t *testing.T) {
 			objs = append(objs, testCluster, tt.node)
 
 			c := fake.NewClientBuilder().WithObjects(objs...).Build()
-			tracker := remote.NewTestClusterCacheTracker(ctrl.Log, c, c, fakeScheme, client.ObjectKeyFromObject(testCluster))
 			r := &Reconciler{
 				Client:       c,
-				ClusterCache: tracker,
+				ClusterCache: clustercache.NewFakeClusterCache(c, client.ObjectKeyFromObject(testCluster)),
 			}
 
 			got, err := r.shouldWaitForNodeVolumes(ctx, testCluster, tt.node.Name)
@@ -2855,11 +2849,10 @@ func TestNodeDeletion(t *testing.T) {
 			m.Spec.NodeDeletionTimeout = tc.deletionTimeout
 
 			fakeClient := tc.createFakeClient(node, m, cpmachine1)
-			tracker := remote.NewTestClusterCacheTracker(ctrl.Log, fakeClient, fakeClient, fakeScheme, client.ObjectKeyFromObject(&testCluster))
 
 			r := &Reconciler{
 				Client:                   fakeClient,
-				ClusterCache:             tracker,
+				ClusterCache:             clustercache.NewFakeClusterCache(fakeClient, client.ObjectKeyFromObject(&testCluster)),
 				recorder:                 record.NewFakeRecorder(10),
 				nodeDeletionRetryTimeout: 10 * time.Millisecond,
 			}
@@ -2979,11 +2972,10 @@ func TestNodeDeletionWithoutNodeRefFallback(t *testing.T) {
 			m.Spec.NodeDeletionTimeout = tc.deletionTimeout
 
 			fakeClient := tc.createFakeClient(node, m, cpmachine1)
-			tracker := remote.NewTestClusterCacheTracker(ctrl.Log, fakeClient, fakeClient, fakeScheme, client.ObjectKeyFromObject(&testCluster))
 
 			r := &Reconciler{
 				Client:                   fakeClient,
-				ClusterCache:             tracker,
+				ClusterCache:             clustercache.NewFakeClusterCache(fakeClient, client.ObjectKeyFromObject(&testCluster)),
 				recorder:                 record.NewFakeRecorder(10),
 				nodeDeletionRetryTimeout: 10 * time.Millisecond,
 			}