[bridge] Remove timeout for 'stopping', as that is responsibility of ws-manager

Author: geropl

components/ws-manager-bridge/src/bridge.ts

@@ -518,7 +518,6 @@ export class WorkspaceManagerBridge implements Disposable {
      *  - preparing
      *  - building
      * It also covers these phases, as fallback, when - for whatever reason - we no longer receive updates from ws-manager.
-     *  - stopping (as fallback, in case ws-manager is stopped to early: configure to be >= then ws-manager timeouts!)
      *  - unknown (fallback)
      */
     protected async controlInstancesTimeouts(parentCtx: TraceContext, runningInstances: RunningWorkspaceInfo[]) {
@@ -552,25 +551,20 @@ export class WorkspaceManagerBridge implements Disposable {
         try {
             const now = Date.now();
             const creationTime = new Date(info.latestInstance.creationTime).getTime();
-            const stoppingTime = new Date(info.latestInstance.stoppingTime ?? now).getTime(); // stoppingTime only set if entered stopping state
             const timedOutInPreparing = now >= creationTime + this.config.timeouts.preparingPhaseSeconds * 1000;
             const timedOutInBuilding = now >= creationTime + this.config.timeouts.buildingPhaseSeconds * 1000;
-            const timedOutInStopping = now >= stoppingTime + this.config.timeouts.stoppingPhaseSeconds * 1000;
             const timedOutInUnknown = now >= creationTime + this.config.timeouts.unknownPhaseSeconds * 1000;
             const currentPhase = info.latestInstance.status.phase;
 
             log.debug(logContext, "Controller: Checking for instances in the DB to mark as stopped", {
                 creationTime,
-                stoppingTime,
                 timedOutInPreparing,
-                timedOutInStopping,
                 currentPhase,
             });
 
             if (
                 (currentPhase === "preparing" && timedOutInPreparing) ||
                 (currentPhase === "building" && timedOutInBuilding) ||
-                (currentPhase === "stopping" && timedOutInStopping) ||
                 (currentPhase === "unknown" && timedOutInUnknown)
             ) {
                 log.info(logContext, "Controller: Marking workspace instance as stopped", {

components/ws-manager-bridge/src/config.ts

@@ -30,7 +30,6 @@ export interface Configuration {
     timeouts: {
         preparingPhaseSeconds: number;
         buildingPhaseSeconds: number;
-        stoppingPhaseSeconds: number;
         unknownPhaseSeconds: number;
     };
 

install/installer/pkg/components/ws-manager-bridge/configmap.go

@@ -27,7 +27,6 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		Timeouts: Timeouts{
 			PreparingPhaseSeconds: 3600,
 			BuildingPhaseSeconds:  3600,
-			StoppingPhaseSeconds:  3600,
 			UnknownPhaseSeconds:   600,
 		},
 		EmulatePreparingIntervalSeconds: 10,

install/installer/pkg/components/ws-manager-bridge/types.go

@@ -24,7 +24,6 @@ type ClusterService struct {
 type Timeouts struct {
 	PreparingPhaseSeconds int32 `json:"preparingPhaseSeconds"`
 	BuildingPhaseSeconds  int32 `json:"buildingPhaseSeconds"`
-	StoppingPhaseSeconds  int32 `json:"stoppingPhaseSeconds"`
 	UnknownPhaseSeconds   int32 `json:"unknownPhaseSeconds"`
 }