From c7da498d6750737e4b2f8a425dca4f22d30ceb1e Mon Sep 17 00:00:00 2001
From: yiannis <yiannis@weave.works>
Date: Mon, 6 Nov 2023 13:40:01 +0000
Subject: [PATCH] fix: Add status subresource to fake client due to
 https://github.com/kubernetes-sigs/controller-runtime/pull/2259

---
 internal/grpctesting/grpctesting.go                   | 2 +-
 pkg/gitopssets/server/server_test.go                  | 2 ++
 pkg/helm/multiwatcher/controller/helm_watcher_test.go | 4 +++-
 pkg/helm/valuesfetcher_test.go                        | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/grpctesting/grpctesting.go b/internal/grpctesting/grpctesting.go
index bc508dbf68..00d799c329 100644
--- a/internal/grpctesting/grpctesting.go
+++ b/internal/grpctesting/grpctesting.go
@@ -39,7 +39,7 @@ func BuildScheme() *runtime.Scheme {
 }
 
 func MakeFactoryWithObjects(objects ...client.Object) (client.Client, *clustersmngrfakes.FakeClustersManager) {
-	k8s := fake.NewClientBuilder().WithScheme(BuildScheme()).WithObjects(objects...).Build()
+	k8s := fake.NewClientBuilder().WithScheme(BuildScheme()).WithObjects(objects...).WithStatusSubresource(&tfctrl.Terraform{}).Build()
 
 	factory := MakeClustersManager(k8s)
 
diff --git a/pkg/gitopssets/server/server_test.go b/pkg/gitopssets/server/server_test.go
index 8031f37b5b..8024a3972d 100644
--- a/pkg/gitopssets/server/server_test.go
+++ b/pkg/gitopssets/server/server_test.go
@@ -541,6 +541,7 @@ func createClient(t *testing.T, clusterState ...runtime.Object) client.Client {
 	c := fake.NewClientBuilder().
 		WithScheme(scheme).
 		WithRuntimeObjects(clusterState...).
+		WithStatusSubresource(&ctrl.GitOpsSet{}).
 		Build()
 
 	return c
@@ -589,6 +590,7 @@ func TestSyncGitOpsSet(t *testing.T) {
 	}()
 
 	ticker := time.NewTicker(500 * time.Millisecond)
+	defer ticker.Stop()
 	for {
 		select {
 		case <-ticker.C:
diff --git a/pkg/helm/multiwatcher/controller/helm_watcher_test.go b/pkg/helm/multiwatcher/controller/helm_watcher_test.go
index c6b23d41d5..5640bd17a6 100644
--- a/pkg/helm/multiwatcher/controller/helm_watcher_test.go
+++ b/pkg/helm/multiwatcher/controller/helm_watcher_test.go
@@ -131,6 +131,7 @@ func TestReconcileDelete(t *testing.T) {
 		makeTestHelmRepo(func(hr *sourcev1beta2.HelmRepository) {
 			newTime := metav1.NewTime(time.Now())
 			hr.ObjectMeta.DeletionTimestamp = &newTime
+			hr.Finalizers = append(hr.Finalizers, "finalizers.fluxcd.io")
 		}),
 		&fakeValuesFetcher{nil, nil},
 		fakeCache,
@@ -152,6 +153,7 @@ func TestReconcileDeletingTheCacheFails(t *testing.T) {
 	deletedHelmRepo := makeTestHelmRepo(func(hr *sourcev1beta2.HelmRepository) {
 		newTime := metav1.NewTime(time.Now())
 		hr.ObjectMeta.DeletionTimestamp = &newTime
+		hr.Finalizers = append(hr.Finalizers, "finalizers.fluxcd.io")
 	})
 	fakeErroringCache := helmfakes.NewFakeChartCache(func(fc *helmfakes.FakeChartCache) {
 		fc.DeleteError = errors.New("nope")
@@ -261,7 +263,7 @@ func setupReconcileAndFakes(helmRepo client.Object, fakeFetcher *fakeValuesFetch
 	scheme := runtime.NewScheme()
 	utilruntime.Must(sourcev1beta2.AddToScheme(scheme))
 
-	fakeClient := fake.NewClientBuilder().WithScheme(scheme)
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&sourcev1beta2.HelmRepository{})
 	if helmRepo != nil {
 		fakeClient = fakeClient.WithObjects(helmRepo)
 	}
diff --git a/pkg/helm/valuesfetcher_test.go b/pkg/helm/valuesfetcher_test.go
index 68e0bc2f64..d09ae47d3f 100644
--- a/pkg/helm/valuesfetcher_test.go
+++ b/pkg/helm/valuesfetcher_test.go
@@ -218,6 +218,7 @@ func createFakeClient(t *testing.T, clusterState ...runtime.Object) client.Clien
 	c := fake.NewClientBuilder().
 		WithScheme(scheme).
 		WithRuntimeObjects(clusterState...).
+		WithStatusSubresource(&sourcev1.HelmChart{}).
 		Build()
 
 	return c