[ws-manager-mk2] Fix stopped status

Author: WVerlaek

components/ws-manager-mk2/controllers/status.go

@@ -40,7 +40,7 @@ func updateWorkspaceStatus(ctx context.Context, workspace *workspacev1.Workspace
 			workspace.Status.Phase = workspacev1.WorkspacePhasePending
 		}
 
-		if isDisposalFinished(workspace) {
+		if workspace.Status.Phase == workspacev1.WorkspacePhaseStopping && isDisposalFinished(workspace) {
 			workspace.Status.Phase = workspacev1.WorkspacePhaseStopped
 		}
 		return nil

components/ws-manager-mk2/service/manager.go

@@ -257,7 +257,7 @@ func (wsm *WorkspaceManagerServer) StartWorkspace(ctx context.Context, req *wsma
 	}
 
 	var wsr workspacev1.Workspace
-	err = wait.PollWithContext(ctx, 100*time.Millisecond, 15*time.Second, func(c context.Context) (done bool, err error) {
+	err = wait.PollWithContext(ctx, 100*time.Millisecond, 30*time.Second, func(c context.Context) (done bool, err error) {
 		err = wsm.Client.Get(ctx, types.NamespacedName{Namespace: wsm.Config.Namespace, Name: ws.Name}, &wsr)
 		if err != nil {
 			return false, nil

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

@@ -224,7 +224,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			ReconnectionInterval:             util.Duration(30 * time.Second),
 			RegistryFacadeHost:               fmt.Sprintf("reg.%s:%d", ctx.Config.Domain, common.RegistryFacadeServicePort),
 			WorkspaceCACertSecret:            customCASecret,
-			WorkspaceMaxConcurrentReconciles: 15,
+			WorkspaceMaxConcurrentReconciles: 25,
 			TimeoutMaxConcurrentReconciles:   15,
 		},
 		Content: struct {