clear service from status on sandbox expiry (#102)

Author: barney-s

controllers/sandbox_controller.go

@@ -486,6 +486,8 @@ func (r *SandboxReconciler) handleSandboxExpiry(ctx context.Context, sandbox *sa
 		allErrors = errors.Join(allErrors, fmt.Errorf("failed to delete service: %w", err))
 	}
 
+	// Clear all status fields explicitly
+	sandbox.Status = sandboxv1alpha1.SandboxStatus{}
 	// Update status to remove Ready condition
 	meta.SetStatusCondition(&sandbox.Status.Conditions, metav1.Condition{
 		Type:               string(sandboxv1alpha1.SandboxConditionReady),
@@ -495,9 +497,6 @@ func (r *SandboxReconciler) handleSandboxExpiry(ctx context.Context, sandbox *sa
 		Message:            "Sandbox has expired",
 	})
 
-	sandbox.Status.Replicas = 0
-	sandbox.Status.LabelSelector = ""
-
 	return allErrors
 }
 

test/e2e/shutdown_test.go

@@ -74,9 +74,9 @@ func TestSandboxShutdownTime(t *testing.T) {
 	// Wait for sandbox status to reflect new state
 	p = []predicates.ObjectPredicate{
 		predicates.SandboxHasStatus(sandboxv1alpha1.SandboxStatus{
-			// TODO: should Service/ServiceFQDN be cleared from status when the Service is deleted?
-			Service:     "my-sandbox",
-			ServiceFQDN: "my-sandbox.my-sandbox-ns.svc.cluster.local",
+			// Service/ServiceFQDN should be cleared from status when the Service is deleted
+			Service:     "",
+			ServiceFQDN: "",
 			Replicas:    0,
 			Conditions: []metav1.Condition{
 				{