misc: `fake.NewFakeClientWithScheme` deprecation

Signed-off-by: Hidde Beydals <hidde@hhh.computer>

internal/controller/helmrelease_controller_chart_test.go

@@ -178,15 +178,13 @@ func TestHelmReleaseReconciler_reconcileChart(t *testing.T) {
 			g.Expect(v2.AddToScheme(scheme.Scheme)).To(Succeed())
 			g.Expect(sourcev1.AddToScheme(scheme.Scheme)).To(Succeed())
 
-			var c client.Client
+			c := fake.NewClientBuilder().WithScheme(scheme.Scheme)
 			if tt.hc != nil {
-				c = fake.NewFakeClientWithScheme(scheme.Scheme, tt.hc)
+				c.WithObjects(tt.hc)
-			} else {
-				c = fake.NewFakeClientWithScheme(scheme.Scheme)
 			}
 
 			r := &HelmReleaseReconciler{
-				Client:              c,
+				Client:              c.Build(),
 				NoCrossNamespaceRef: tt.noCrossNamspaceRef,
 			}
 
@@ -203,7 +201,7 @@ func TestHelmReleaseReconciler_reconcileChart(t *testing.T) {
 
 			if tt.expectGC {
 				objKey := client.ObjectKeyFromObject(tt.hc)
-				err = c.Get(context.TODO(), objKey, tt.hc.DeepCopy())
+				err = r.Get(context.TODO(), objKey, tt.hc.DeepCopy())
 				g.Expect(apierrors.IsNotFound(err)).To(BeTrue())
 			}
 		})
@@ -259,15 +257,13 @@ func TestHelmReleaseReconciler_deleteHelmChart(t *testing.T) {
 			g.Expect(v2.AddToScheme(scheme.Scheme)).To(Succeed())
 			g.Expect(sourcev1.AddToScheme(scheme.Scheme)).To(Succeed())
 
-			var c client.Client
+			c := fake.NewClientBuilder().WithScheme(scheme.Scheme)
 			if tt.hc != nil {
-				c = fake.NewFakeClientWithScheme(scheme.Scheme, tt.hc)
+				c.WithObjects(tt.hc)
-			} else {
-				c = fake.NewFakeClientWithScheme(scheme.Scheme)
 			}
 
 			r := &HelmReleaseReconciler{
-				Client: c,
+				Client: c.Build(),
 			}
 
 			err := r.deleteHelmChart(context.TODO(), tt.hr)

internal/controller/helmrelease_controller_fuzz_test.go

@@ -28,6 +28,7 @@ import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/yaml"
 
@@ -122,7 +123,7 @@ other: values
 		// v2.ValuesReference. Therefore a static value here suffices, and instead we just
 		// play with the objects presence/absence.
 		objectName := "values"
-		resources := []runtime.Object{}
+		var resources []client.Object
 
 		if createObject {
 			resources = append(resources,
@@ -146,7 +147,7 @@ other: values
 			},
 		}
 
-		c := fake.NewFakeClientWithScheme(scheme, resources...)
+		c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(resources...).Build()
 		r := &HelmReleaseReconciler{Client: c}
 		var values *apiextensionsv1.JSON
 		if hrValues != "" {
@@ -221,13 +222,13 @@ other: values
 		hc.ObjectMeta.Name = hr.GetHelmChartName()
 		hc.ObjectMeta.Namespace = hr.Spec.Chart.GetNamespace(hr.Namespace)
 
-		resources := []runtime.Object{
+		resources := []client.Object{
 			valuesConfigMap("values", map[string]string{valuesKey: configData}),
 			valuesSecret("values", map[string][]byte{valuesKey: secretData}),
 			&hc,
 		}
 
-		c := fake.NewFakeClientWithScheme(scheme, resources...)
+		c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(resources...).Build()
 		r := &HelmReleaseReconciler{
 			Client:        c,
 			EventRecorder: &DummyRecorder{},

internal/controller/helmrelease_controller_test.go

@@ -43,7 +43,7 @@ func TestHelmReleaseReconciler_composeValues(t *testing.T) {
 
 	tests := []struct {
 		name       string
-		resources  []runtime.Object
+		resources  []client.Object
 		references []v2.ValuesReference
 		values     string
 		want       chartutil.Values
@@ -51,7 +51,7 @@ func TestHelmReleaseReconciler_composeValues(t *testing.T) {
 	}{
 		{
 			name: "merges",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesConfigMap("values", map[string]string{
 					"values.yaml": `flat: value
 nested:
@@ -88,7 +88,7 @@ other: values
 		},
 		{
 			name: "target path",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesSecret("values", map[string][]byte{"single": []byte("value")}),
 			},
 			references: []v2.ValuesReference{
@@ -111,7 +111,7 @@ other: values
 		},
 		{
 			name: "target path with boolean value",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesSecret("values", map[string][]byte{"single": []byte("true")}),
 			},
 			references: []v2.ValuesReference{
@@ -134,7 +134,7 @@ other: values
 		},
 		{
 			name: "target path with set-string behavior",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesSecret("values", map[string][]byte{"single": []byte("\"true\"")}),
 			},
 			references: []v2.ValuesReference{
@@ -201,7 +201,7 @@ other: values
 		},
 		{
 			name: "missing secret key",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesSecret("values", nil),
 			},
 			references: []v2.ValuesReference{
@@ -215,7 +215,7 @@ other: values
 		},
 		{
 			name: "missing config map key",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesConfigMap("values", nil),
 			},
 			references: []v2.ValuesReference{
@@ -238,7 +238,7 @@ other: values
 		},
 		{
 			name: "invalid values",
-			resources: []runtime.Object{
+			resources: []client.Object{
 				valuesConfigMap("values", map[string]string{
 					"values.yaml": `
 invalid`,
@@ -256,7 +256,7 @@ invalid`,
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := fake.NewFakeClientWithScheme(scheme, tt.resources...)
+			c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.resources...).Build()
 			r := &HelmReleaseReconciler{Client: c}
 			var values *apiextensionsv1.JSON
 			if tt.values != "" {