Skip to content
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.

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

Ensure workspace classes do not break selfhosted customers #12261

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Conversation

Furisto
Copy link
Member

@Furisto Furisto commented Aug 22, 2022

Description

See https://gitpod.slack.com/archives/C01KLC56NP7/p1660828231371779
Lets walk through the scenarios:

  • Self-hosted

    • The installer surface is the same as before workspace classes
    • MinLimit and BurstLimit will be set to the value specified in workspace.resources.limits.cpu
    • The BurstLimit will be used to set the Kubernetes limit (i.e. workspace.resources.limits.cpu as before)
      -- > most customers are done at this point
    • If customers also have the ws-daemon cpu limiting enabled
      • Limiting will be applied based on the configuration in ws-daemon
      • It will not use the annotation based limiting because the annotation will not be set on the workspace pod. This would require that the workspace_classes feature flag is enabled. This is not the case on self-hosted.
  • SaaS

    • Customers for which workspace classes have been enabled
      • Workspaces will either get g1-standard or g1-large, default is not available to them, so this has no impact on them.
    • Customers for which workspace classes have not been enabled
      • MinLimit and BurstLimit will be set to the value specified in workspace.resources.limits.cpu
      • The BurstLimit will be used to set the Kubernetes limit (i.e. workspace.resources.limits.cpu as before)
      • ws-daemon cpu limiting is enabled
      • Limiting will be applied based on the configuration in ws-daemon because annotation based limiting requries the WORKSPACE_CLASS_LIMITING feature flag which is only send to ws-manager if workspace classes are enabled for the customer

Related Issue(s)

Fixes #

How to test

Check golden files

Release Notes

None

Werft options:

  • /werft with-preview

@Furisto Furisto requested review from a team August 22, 2022 10:14
@github-actions github-actions bot added team: delivery Issue belongs to the self-hosted team team: workspace Issue belongs to the Workspace team labels Aug 22, 2022
Copy link
Contributor

@mrsimonemms mrsimonemms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is as we expect it for Self-Hosted, thanks.

It would be helpful if a new golden file test were added with the workspace resource set. This would nicely demonstrate this change.

@corneliusludmann
Copy link
Contributor

It would be helpful if a new golden file test were added with the workspace resource set. This would nicely demonstrate this change.

💯 %!

As I mentioned in the Slack thread, I used those to tests the changes. Feel free to copy them.

@Furisto
Copy link
Member Author

Furisto commented Aug 22, 2022

@mrsimonemms PTAL

Copy link
Contributor

@mrsimonemms mrsimonemms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@roboquat roboquat merged commit 441f073 into main Aug 22, 2022
@roboquat roboquat deleted the fo/sh-compat branch August 22, 2022 14:02
@mrsimonemms
Copy link
Contributor

@Furisto it looks like this has broken the main build https://werft.gitpod-dev.com/job/gitpod-build-main.4334

Can you open another PR with a new generation of the golden files and send it my way please to approve?

@Furisto
Copy link
Member Author

Furisto commented Aug 22, 2022

@mrsimonemms On it

@Furisto
Copy link
Member Author

Furisto commented Aug 22, 2022

@mrsimonemms #12270

@Furisto Furisto changed the title Ensure workspace classes to not break selfhosted customers Ensure workspace classes do not break selfhosted customers Aug 22, 2022
@roboquat roboquat added the deployed: workspace Workspace team change is running in production label Aug 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: workspace Workspace team change is running in production feature: workspace classes release-note-none size/XXL team: delivery Issue belongs to the self-hosted team team: workspace Issue belongs to the Workspace team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants