test: pass WithStatusSubresource to the fake client

With the upgrade to controller-runtime v0.15 we need to supplement the fake builder to contain instantiation `WithStatusSubresource` in order to be able to update status of the object that we have created. In previous versions of controller-runtime this was not necessary because the semantics was ignored but in v0.15 the fake client cannot infer the status subresource without its explicit instantiation. Ref.: kubernetes-sigs/controller-runtime#2362 Signed-off-by: Mat Kowalski <mko@redhat.com>
mkowalski · Oct 20, 2023 · b0b2555 · b0b2555
1 parent 04ad85b
commit b0b2555
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/controllers/handler/node_controller_test.go b/controllers/handler/node_controller_test.go
@@ -82,7 +82,12 @@ var _ = Describe("Node controller reconcile", func() {
 		objs := []runtime.Object{&node, &nodenetworkstate}
 
 		// Create a fake client to mock API calls.
-		cl = fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+		cl = fake.
+			NewClientBuilder().
+			WithScheme(s).
+			WithRuntimeObjects(objs...).
+			WithStatusSubresource(&nmstatev1beta1.NodeNetworkState{}).
+			Build()
 
 		reconciler.Client = cl
 		reconciler.Log = ctrl.Log.WithName("controllers").WithName("Node")

diff --git a/controllers/handler/nodenetworkconfigurationenactment_controller_test.go b/controllers/handler/nodenetworkconfigurationenactment_controller_test.go
@@ -83,7 +83,12 @@ var _ = Describe("Node Network Configuration Enactment controller reconcile", fu
 		objs := []runtime.Object{&policy, &enactment}
 
 		// Create a fake client to mock API calls.
-		cl = fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+		cl = fake.
+			NewClientBuilder().
+			WithScheme(s).
+			WithRuntimeObjects(objs...).
+			WithStatusSubresource(&nmstatev1beta1.NodeNetworkConfigurationEnactment{}).
+			Build()
 
 		reconciler.Client = cl
 		reconciler.Log = ctrl.Log.WithName("controllers").WithName("Enactment")

diff --git a/controllers/handler/nodenetworkconfigurationpolicy_controller_test.go b/controllers/handler/nodenetworkconfigurationpolicy_controller_test.go
@@ -143,6 +143,10 @@ var _ = Describe("NodeNetworkConfigurationPolicy controller predicates", func()
 			clb := fake.ClientBuilder{}
 			clb.WithScheme(s)
 			clb.WithRuntimeObjects(objs...)
+			clb.WithStatusSubresource(
+				&nmstatev1beta1.NodeNetworkConfigurationEnactment{},
+				&nmstatev1.NodeNetworkConfigurationPolicy{},
+			)
 			cl := clb.Build()
 
 			reconciler.Client = cl

diff --git a/controllers/operator/nmstate_controller_test.go b/controllers/operator/nmstate_controller_test.go
@@ -93,7 +93,12 @@ var _ = Describe("NMState controller reconcile", func() {
 		)
 		objs := []runtime.Object{&nmstate}
 		// Create a fake client to mock API calls.
-		cl = fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+		cl = fake.
+			NewClientBuilder().
+			WithScheme(s).
+			WithRuntimeObjects(objs...).
+			WithStatusSubresource(&nmstatev1.NMState{}).
+			Build()
 		names.ManifestDir = manifestsDir
 		reconciler.Client = cl
 		reconciler.APIClient = cl

diff --git a/pkg/policyconditions/conditions_test.go b/pkg/policyconditions/conditions_test.go
@@ -211,7 +211,12 @@ var _ = Describe("Policy Conditions", func() {
 
 			objs = append(objs, updatedPolicy)
 
-			client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+			client := fake.
+				NewClientBuilder().
+				WithScheme(s).
+				WithRuntimeObjects(objs...).
+				WithStatusSubresource(&nmstatev1.NodeNetworkConfigurationPolicy{}).
+				Build()
 			key := types.NamespacedName{Name: updatedPolicy.Name}
 			err := Update(client, client, key)
 			Expect(err).ToNot(HaveOccurred())