New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce `max_parallel_running_workspaces` for orgs #20448

Merged

roboquat merged 11 commits into main from ft/org-max-parallel-ws-restriction

Dec 16, 2024

+1,180 −630

Member

filiptronicek commented Dec 13, 2024

Description

Introduces a couple of changes:

limits the per-user running workspace amount per user to 16 for Dedicated installations
adds a configurable limit of these in-parallel running workspaces to the organization settings, which on Dedicated can be even raised higher than the default 16

Related Issue(s)

How to test

Open the Preview environment
Change the org settings to limit the parallel ws amount to 1
Try opening 2 workspaces

/hold

filiptronicek added 6 commits

December 13, 2024 08:36


          Introduce max_parallel_running_workspaces for orgs

cd5d325


          Add migration

9ddf926


          Add UI and org settings server changes


          Rough edges

2ebdf30


          Number inputs (:trollface:)

7188a5c


          Move LazyOrganizationService to UBP entitlement service to get rid of…

969c030

… circ. dep. errs

roboquat added do-not-merge/work-in-progress do-not-merge/hold size/XL labels


          Fix tests

5474c7d

filiptronicek force-pushed the ft/org-max-parallel-ws-restriction branch from 0ae6ad8 to 5474c7d Compare

December 16, 2024 10:03

filiptronicek marked this pull request as ready for review

December 16, 2024 10:08

filiptronicek requested review from a team as code owners

December 16, 2024 10:08

roboquat removed the do-not-merge/work-in-progress label

filiptronicek self-assigned this

github-actions bot added team: team-experience team: team-enterprise labels

geropl reviewed

View reviewed changes

components/dashboard/src/teams/TeamPolicies.tsx Outdated Show resolved Hide resolved

geropl reviewed

View reviewed changes

components/gitpod-db/src/typeorm/entity/db-team-settings.ts Outdated Show resolved Hide resolved

geropl reviewed

View reviewed changes

components/server/src/api/organization-service-api.ts Outdated Show resolved Hide resolved


          Update components/gitpod-db/src/typeorm/entity/db-team-settings.ts

37dd291

Co-authored-by: Gero Posmyk-Leinemann <[email protected]>

geropl reviewed

View reviewed changes

components/gitpod-protocol/src/gitpod-service.ts Show resolved Hide resolved

geropl reviewed

View reviewed changes

components/public-api/gitpod/v1/organization.proto Outdated Show resolved Hide resolved

geropl reviewed

View reviewed changes

components/server/src/billing/entitlement-service.ts Outdated Show resolved Hide resolved

geropl reviewed

View reviewed changes

components/server/src/workspace/workspace-service.ts Outdated Show resolved Hide resolved

filiptronicek and others added 3 commits

December 16, 2024 13:15


          Rename isPaidPlan to isPaidOrDedicated and get rid of `update_max…

ea621ca

…_parallel_running_workspaces`


          Update components/server/src/workspace/workspace-service.ts

748421d

Co-authored-by: Gero Posmyk-Leinemann <[email protected]>


          Deduplicate instance counting logic

1abd308

filiptronicek commented

View reviewed changes

components/server/leeway.Dockerfile Show resolved Hide resolved

geropl approved these changes

View reviewed changes

Member

geropl left a comment

Code LGTM, tested and works! ✔️

filiptronicek removed the do-not-merge/hold label

roboquat merged commit 55b486e into main

19 checks passed

roboquat deleted the ft/org-max-parallel-ws-restriction branch

December 16, 2024 14:06

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XL team: team-enterprise team: team-experience