add notification to the subStatus resource

controllers/masteruserrecord/sync_test.go

@@ -235,6 +235,8 @@ func TestSyncMurStatusWithUserAccountStatusWhenUpdated(t *testing.T) {
 
 		// when
 		preSyncTime := metav1.Now()
+		// add a delay of a second to avoid flakiness
+		time.Sleep(1 * time.Second)
 		err := sync.synchronizeStatus(context.TODO())
 
 		// then

controllers/notification/notification_controller_test.go

@@ -92,7 +92,8 @@ func TestNotificationSentFailure(t *testing.T) {
 	t.Run("will return an error since it cannot delete the Notification after successfully sending", func(t *testing.T) {
 		// given
 		ds, _ := mockDeliveryService(defaultTemplateLoader())
-		controller, cl := newController(t, ds, toolchainConfig)
+		controller, cl := newController(t, ds, toolchainConfig, &toolchainv1alpha1.Notification{})
+		// Add notification to fakeclient - update failing because notification status not found as subresource
 		cl.MockDelete = func(ctx context.Context, obj runtimeclient.Object, opts ...runtimeclient.DeleteOption) error {
 			return fmt.Errorf("error")
 		}
@@ -141,7 +142,7 @@ func TestNotificationDelivery(t *testing.T) {
 				},
 			},
 		}
-		controller, cl := newController(t, ds, userSignup)
+		controller, cl := newController(t, ds, userSignup, &toolchainv1alpha1.Notification{})
 
 		notification, err := notify.NewNotificationBuilder(cl, test.HostOperatorNs).
 			WithUserContext(userSignup).
@@ -189,7 +190,7 @@ func TestNotificationDelivery(t *testing.T) {
 
 	t.Run("test admin notification delivery ok", func(t *testing.T) {
 		// given
-		controller, cl := newController(t, ds)
+		controller, cl := newController(t, ds, &toolchainv1alpha1.Notification{})
 
 		notification, err := notify.NewNotificationBuilder(cl, test.HostOperatorNs).
 			WithSubjectAndContent("Alert", "Something bad happened").
@@ -251,7 +252,7 @@ func TestNotificationDelivery(t *testing.T) {
 			},
 		}
 		// pass in nil for deliveryService since send won't be used (sending skipped)
-		controller, cl := newController(t, nil, userSignup, toolchainConfig)
+		controller, cl := newController(t, nil, userSignup, toolchainConfig, &toolchainv1alpha1.Notification{})
 
 		notification, err := notify.NewNotificationBuilder(cl, test.HostOperatorNs).
 			Create(context.TODO(), "[email protected]")
@@ -292,7 +293,7 @@ func TestNotificationDelivery(t *testing.T) {
 			},
 		}
 		mds := &MockDeliveryService{}
-		controller, cl := newController(t, mds, userSignup)
+		controller, cl := newController(t, mds, userSignup, &toolchainv1alpha1.Notification{})
 
 		notification, err := notify.NewNotificationBuilder(cl, test.HostOperatorNs).
 			Create(context.TODO(), "[email protected]")

controllers/spacerequest/spacerequest_controller_test.go

@@ -818,7 +818,8 @@ func TestCreateSpaceRequest(t *testing.T) {
 			subSpace := spacetest.NewSpace(commontest.HostOperatorNs, spaceutil.SubSpaceName(parentSpace, sr),
 				spacetest.WithLabel(toolchainv1alpha1.SpaceRequestLabelKey, sr.GetName()),               // subSpace was created from spaceRequest
 				spacetest.WithLabel(toolchainv1alpha1.SpaceRequestNamespaceLabelKey, sr.GetNamespace()), // subSpace was created from spaceRequest
-				spacetest.WithDeletionTimestamp(),                                                       // space is being deleted ...
+				spacetest.WithFinalizer(),         // finalizer needs to be added to add deletionTS
+				spacetest.WithDeletionTimestamp(), // space is being deleted ...
 				spacetest.WithSpecParentSpace("jane"))
 			hostClient := commontest.NewFakeClient(t, appstudioEnvTier, parentSpace, subSpace)
 			ctrl := newReconciler(t, hostClient, member1)
@@ -953,6 +954,7 @@ func TestCreateSpaceRequest(t *testing.T) {
 			// given
 			parentSpace := spacetest.NewSpace(commontest.HostOperatorNs, "jane",
 				spacetest.WithCondition(spacetest.Terminating()),
+				spacetest.WithFinalizer(),
 				spacetest.WithDeletionTimestamp()) // parent space for some reason is being deleted
 			member1Client := commontest.NewFakeClient(t, sr, srNamespace)
 			member1 := NewMemberClusterWithClient(member1Client, "member-1", corev1.ConditionTrue)