mathew commit 1

Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com>

workspaces/controller/internal/controller/workspace_controller.go

@@ -935,7 +935,6 @@ func (r *WorkspaceReconciler) generateWorkspaceStatus(ctx context.Context, log l
 		}
 	}
 
-
 	// cases where the Pod does not exist
 	if pod == nil {
 		// STATUS: Paused

workspaces/controller/internal/controller/workspace_controller_test.go

@@ -18,9 +18,10 @@ package controller
 
 import (
 	"fmt"
-	"k8s.io/utils/ptr"
 	"time"
 
+	"k8s.io/utils/ptr"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 
@@ -131,23 +132,37 @@ var _ = Describe("Workspace Controller", func() {
 			workspace := NewExampleWorkspace1(workspaceName, namespaceName, workspaceKindName)
 			Expect(k8sClient.Create(ctx, workspace)).To(Succeed())
 
+			By("pausing the Workspace")
 			patch := client.MergeFrom(workspace.DeepCopy())
-			By("setting the Workspace to paused")
-			Expect(workspace.Status.PauseTime).To(Equal(int64(0)))
 			newWorkspace := workspace.DeepCopy()
 			newWorkspace.Spec.Paused = ptr.To(true)
 			Expect(k8sClient.Patch(ctx, newWorkspace, patch)).To(Succeed())
-			// Define a small range for acceptable time difference
-			timeRangeSeconds := int64(2) // 2-second range
-			currentTime := metav1.Now().Unix()
+
+			By("setting the Workspace `status.pauseTime` to the current time")
+			tolerance := int64(5)
+			currentTime := time.Now().Unix()
+			Eventually(func() (int64, error) {
+				err := k8sClient.Get(ctx, types.NamespacedName{Name: workspaceName, Namespace: namespaceName}, workspace)
+				if err != nil {
+					return 0, err
+				}
+				return workspace.Status.PauseTime, nil
+			}, timeout, interval).Should(BeNumerically("~", currentTime, tolerance))
+
+			By("un-pausing the Workspace")
+			patch = client.MergeFrom(workspace.DeepCopy())
+			newWorkspace = workspace.DeepCopy()
+			newWorkspace.Spec.Paused = ptr.To(false)
+			Expect(k8sClient.Patch(ctx, newWorkspace, patch)).To(Succeed())
+
+			By("setting the Workspace `status.pauseTime` to 0")
 			Eventually(func() (int64, error) {
 				err := k8sClient.Get(ctx, types.NamespacedName{Name: workspaceName, Namespace: namespaceName}, workspace)
 				if err != nil {
 					return 0, err
 				}
 				return workspace.Status.PauseTime, nil
-			}).Should(BeNumerically("<=", currentTime+timeRangeSeconds))
-			Expect(workspace.Spec.Paused).To(Equal(ptr.To(true)))
+			}, timeout, interval).Should(BeZero())
 
 			By("creating a StatefulSet")
 			statefulSetList := &appsv1.StatefulSetList{}
@@ -157,7 +172,7 @@ var _ = Describe("Workspace Controller", func() {
 					return nil, err
 				}
 				return statefulSetList.Items, nil
-			}).Should(HaveLen(1))
+			}, timeout, interval).Should(HaveLen(1))
 
 			// TODO: use this to get the StatefulSet
 			//statefulSet := statefulSetList.Items[0]
@@ -170,7 +185,7 @@ var _ = Describe("Workspace Controller", func() {
 					return nil, err
 				}
 				return serviceList.Items, nil
-			}).Should(HaveLen(1))
+			}, timeout, interval).Should(HaveLen(1))
 
 			// TODO: use this to get the Service
 			//service := serviceList.Items[0]