Fix test with non-existent DWOC

Signed-off-by: Ales Raszka <[email protected]>

Author: Allda

controllers/backupcronjob/backupcronjob_controller.go

@@ -250,7 +250,7 @@ func (r *BackupCronJobReconciler) executeBackupSync(ctx context.Context, dwOpera
 	err = r.NonCachingClient.Status().Patch(ctx, dwOperatorConfig, origConfig)
 	if err != nil {
 		log.Error(err, "Failed to update DevWorkspaceOperatorConfig status with last backup time")
-		// Not returning error as the backup jobs were created successfully
+		return err
 	}
 	return nil
 }
@@ -299,7 +299,7 @@ func (r *BackupCronJobReconciler) createBackupJob(
 		return err
 	}
 
-	// Find a PVC with the name "claim-devworkspace" or based on the name from the operator config
+	// Find a PVC with used by the workspace
 	pvcName, workspacePath, err := r.getWorkspacePVCName(workspace, dwOperatorConfig, ctx, log)
 	if err != nil {
 		log.Error(err, "Failed to get workspace PVC name", "devworkspace", workspace.Name)

controllers/backupcronjob/backupcronjob_controller_test.go

@@ -57,7 +57,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 		Expect(dwv2.AddToScheme(scheme)).To(Succeed())
 		Expect(corev1.AddToScheme(scheme)).To(Succeed())
 		Expect(batchv1.AddToScheme(scheme)).To(Succeed())
-		fakeClient = fake.NewClientBuilder().WithScheme(scheme).Build()
+		fakeClient = fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&controllerv1alpha1.DevWorkspaceOperatorConfig{}).Build()
 		log = zap.New(zap.UseDevMode(true)).WithName("BackupCronJobReconcilerTest")
 
 		reconciler = BackupCronJobReconciler{
@@ -301,6 +301,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					},
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-recent", "ns-a", false, metav1.NewTime(time.Now().Add(-10*time.Minute)))
 			dw.Status.Phase = dwv2.DevWorkspaceStatusStopped
 			dw.Status.DevWorkspaceId = "id-recent"
@@ -334,6 +335,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					},
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-recent", "ns-a", false, metav1.NewTime(time.Now().Add(-10*time.Minute)))
 			dw.Status.Phase = dwv2.DevWorkspaceStatusStopped
 			dw.Status.DevWorkspaceId = "id-recent"
@@ -389,6 +391,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					LastBackupTime: &lastBackupTime,
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-old", "ns-b", false, metav1.NewTime(time.Now().Add(-60*time.Minute)))
 			dw.Status.Phase = dwv2.DevWorkspaceStatusStopped
 			dw.Status.DevWorkspaceId = "id-old"
@@ -421,6 +424,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					},
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-running", "ns-c", true, metav1.NewTime(time.Now().Add(-5*time.Minute)))
 			Expect(fakeClient.Create(ctx, dw)).To(Succeed())
 
@@ -452,6 +456,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					},
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-recent", "ns-a", false, metav1.NewTime(time.Now().Add(-10*time.Minute)))
 			dw.Status.Phase = dwv2.DevWorkspaceStatusStopped
 			dw.Status.DevWorkspaceId = "id-recent"
@@ -487,6 +492,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 					},
 				},
 			}
+			Expect(fakeClient.Create(ctx, dwoc)).To(Succeed())
 			dw := createDevWorkspace("dw-recent", "ns-a", false, metav1.NewTime(time.Now().Add(-10*time.Minute)))
 			dw.Status.Phase = dwv2.DevWorkspaceStatusStopped
 			dw.Status.DevWorkspaceId = "id-recent"