Adjust controller setup, mapping funcs and fakeclient

metal3-io · May 30, 2023 · d205c3c · d205c3c
1 parent 35a6bd4
commit d205c3c
Show file tree

Hide file tree

Showing 23 changed files with 207 additions and 127 deletions.
diff --git a/baremetal/metal3cluster_manager_test.go b/baremetal/metal3cluster_manager_test.go
@@ -387,7 +387,7 @@ func newBMClusterSetup(tc testCaseBMClusterManager) (*ClusterManager, error) {
 	if tc.BMCluster != nil {
 		objects = append(objects, tc.BMCluster)
 	}
-	fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+	fakeClient := fakeClientWithObjects(setupScheme(), objects...)
 
 	return &ClusterManager{
 		client:        fakeClient,
@@ -409,7 +409,7 @@ func descendantsSetup(tc descendantsTestCase) *ClusterManager {
 	for _, machine := range tc.Machines {
 		objects = append(objects, machine)
 	}
-	fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+	fakeClient := fakeClientWithObjects(setupScheme(), objects...)
 
 	return &ClusterManager{
 		client:        fakeClient,

diff --git a/baremetal/metal3data_manager_test.go b/baremetal/metal3data_manager_test.go
@@ -38,7 +38,6 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	caipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 var _ = Describe("Metal3Data manager", func() {
@@ -100,7 +99,8 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.m3m != nil {
 				objects = append(objects, tc.m3m)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
+
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)
@@ -181,7 +181,7 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.networkdataSecret != nil {
 				objects = append(objects, tc.networkdataSecret)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)
@@ -570,7 +570,7 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.m3dt != nil {
 				objects = append(objects, tc.m3dt)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)
@@ -663,7 +663,7 @@ var _ = Describe("Metal3Data manager", func() {
 				ObjectMeta: testObjectMeta(metal3DataTemplateName, namespaceName, ""),
 				Spec:       tc.m3dtSpec,
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
 			dataMgr, err := NewDataManager(fakeClient, m3d,
 				logr.Discard(),
 			)
@@ -1041,7 +1041,8 @@ var _ = Describe("Metal3Data manager", func() {
 				ObjectMeta: testObjectMeta(metal3DataTemplateName+"-abc", "", ""),
 				Spec:       tc.m3dtSpec,
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
+
 			dataMgr, err := NewDataManager(fakeClient, m3d,
 				logr.Discard(),
 			)
@@ -1229,7 +1230,8 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.m3dt != nil {
 				objects = append(objects, tc.m3dt)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
+
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)
@@ -1472,7 +1474,7 @@ var _ = Describe("Metal3Data manager", func() {
 				objects = append(objects, tc.ipClaim)
 			}
 			fake := &releaseAddressFromPoolFakeClient{
-				Client:          fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build(),
+				Client:          fakeClientWithObjects(setupScheme(), objects...),
 				injectDeleteErr: tc.injectDeleteErr,
 			}
 			dataMgr, err := NewDataManager(fake, tc.m3d,
@@ -1555,7 +1557,7 @@ var _ = Describe("Metal3Data manager", func() {
 	}
 
 	DescribeTable("ensureIPClaim", func(tc testCaseEnsureClaim) {
-		fc := fakeClient(tc.ipClaim)
+		fc := fakeClientWithObjects(setupScheme(), tc.ipClaim)
 		m3d := &infrav1.Metal3Data{
 			ObjectMeta: testObjectMeta(metal3DataName, namespaceName, ""),
 		}
@@ -1636,7 +1638,8 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.ipClaim != nil {
 				objects = append(objects, tc.ipClaim)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
+
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)
@@ -1776,7 +1779,8 @@ var _ = Describe("Metal3Data manager", func() {
 			if tc.ipClaim != nil {
 				objects = append(objects, tc.ipClaim)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupScheme()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupScheme(), objects...)
+
 			dataMgr, err := NewDataManager(fakeClient, tc.m3d,
 				logr.Discard(),
 			)

diff --git a/baremetal/metal3datatemplate_manager_test.go b/baremetal/metal3datatemplate_manager_test.go
@@ -30,7 +30,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 var timeNow = metav1.Now()
@@ -145,7 +144,8 @@ var _ = Describe("Metal3DataTemplate manager", func() {
 			for _, address := range tc.indexes {
 				objects = append(objects, address)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupSchemeMm()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupSchemeMm(), objects...)
+
 			templateMgr, err := NewDataTemplateManager(fakeClient, tc.template,
 				logr.Discard(),
 			)
@@ -252,7 +252,8 @@ var _ = Describe("Metal3DataTemplate manager", func() {
 			for _, claim := range tc.dataClaims {
 				objects = append(objects, claim)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupSchemeMm()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupSchemeMm(), objects...)
+
 			templateMgr, err := NewDataTemplateManager(fakeClient, tc.template,
 				logr.Discard(),
 			)
@@ -446,7 +447,8 @@ var _ = Describe("Metal3DataTemplate manager", func() {
 			if tc.dataObject != nil {
 				objects = append(objects, tc.dataObject)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupSchemeMm()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupSchemeMm(), objects...)
+
 			templateMgr, err := NewDataTemplateManager(fakeClient, tc.template2,
 				logr.Discard(),
 			)
@@ -613,7 +615,8 @@ var _ = Describe("Metal3DataTemplate manager", func() {
 			for _, address := range tc.datas {
 				objects = append(objects, address)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupSchemeMm()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupSchemeMm(), objects...)
+
 			templateMgr, err := NewDataTemplateManager(fakeClient, tc.template,
 				logr.Discard(),
 			)
@@ -761,7 +764,8 @@ var _ = Describe("Metal3DataTemplate manager", func() {
 			for _, address := range tc.datas {
 				objects = append(objects, address)
 			}
-			fakeClient := fake.NewClientBuilder().WithScheme(setupSchemeMm()).WithObjects(objects...).Build()
+			fakeClient := fakeClientWithObjects(setupSchemeMm(), objects...)
+
 			templateMgr, err := NewDataTemplateManager(fakeClient, tc.template,
 				logr.Discard(),
 			)