1

Author: iQQBot

components/ws-daemon/pkg/controller/workspace_controller.go

@@ -353,7 +353,7 @@ func (wsc *WorkspaceController) doWorkspaceContentBackup(ctx context.Context, sp
 		// If the container is still in a running state after that,
 		// there may be an issue with state synchronization.
 		// We should start backup anyway to avoid data loss.
-		if !(ws.DeletionTimestamp != nil && time.Since(ws.DeletionTimestamp.Time) > 5*time.Minute) {
+		if !(ws.Status.PodStoppingTime != nil && time.Since(ws.Status.PodStoppingTime.Time) > 5*time.Minute) {
 			// We should get an event when the condition changes, but requeue
 			// anyways to make sure we act on it in time.
 			return ctrl.Result{RequeueAfter: 500 * time.Millisecond}, nil

components/ws-manager-api/go/crd/v1/workspace_types.go

@@ -184,6 +184,7 @@ type WorkspaceStatus struct {
 	PodStarts       int          `json:"podStarts"`
 	PodRecreated    int          `json:"podRecreated"`
 	PodDeletionTime *metav1.Time `json:"podDeletionTime,omitempty"`
+	PodStoppingTime *metav1.Time `json:"podStoppingTime,omitempty"`
 	URL             string       `json:"url,omitempty" scrub:"redact"`
 	OwnerToken      string       `json:"ownerToken,omitempty" scrub:"redact"`
 

components/ws-manager-api/go/crd/v1/zz_generated.deepcopy.go

@@ -548,11 +548,14 @@ spec:
                 - Stopping
                 - Stopped
                 type: string
-              podStarts:
-                type: integer
+              podDeletionTime:
+                format: date-time
+                type: string
               podRecreated:
                 type: integer
-              podDeletionTime:
+              podStarts:
+                type: integer
+              podStoppingTime:
                 format: date-time
                 type: string
               runtime:
@@ -587,6 +590,7 @@ spec:
               url:
                 type: string
             required:
+            - podRecreated
             - podStarts
             type: object
         type: object

components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml

@@ -472,6 +472,8 @@ func (r *WorkspaceReconciler) emitPhaseEvents(ctx context.Context, ws *workspace
 	}
 
 	if ws.Status.Phase == workspacev1.WorkspacePhaseStopping && old.Phase != workspacev1.WorkspacePhaseStopping {
+		t := metav1.Now()
+		ws.Status.PodDeletionTime = &t
 		r.Recorder.Event(ws, corev1.EventTypeNormal, "Stopping", "")
 	}
 }