Skip to content

[ws-proxy] support ports location for debug workspace #15910

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
Merged
roboquat merged 1 commit into from
Jan 20, 2023
Merged

[ws-proxy] support ports location for debug workspace #15910

roboquat merged 1 commit into from
Jan 20, 2023

Conversation

@akosyakov
Copy link
Member

@akosyakov akosyakov commented Jan 19, 2023 •
edited
Loading

Description

It is a prerequisite to #15795. Based on Pudong's work from #15687.

Related Issue(s)

Fixes #

How to test

It is not possible to test new functionality yet. Only in context of #15795. Review code and tests. Test for regressions, i.e. start a workspace, start something inside and check that you can access it.

Release Notes

NONE

Documentation

Build Options:

  • /werft with-github-actions
    Experimental feature to run the build with GitHub Actions (and not in Werft).
  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-integration-tests=workspace
    Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh

@akosyakov @iQQBot
[ws-proxy] support ports location for debug workspace
7b0ebb8 
It is a prerequisite to #15795. Based on Pudong's work from #15687.

Co-authored-by: Pudong Zheng <tianshi8650@gmail.com>
@akosyakov akosyakov requested a review from a team January 19, 2023 20:47
@werft-gitpod-dev-com
Copy link

werft-gitpod-dev-com bot commented Jan 19, 2023

started the job as gitpod-build-ak-debug-ports.1 because the annotations in the pull request description changed
(with .werft/ from main)

@github-actions github-actions bot added the team: workspace Issue belongs to the Workspace team label Jan 19, 2023
This was referenced Jan 19, 2023
Closed
Closed
utam0k
utam0k reviewed Jan 20, 2023
View reviewed changes
components/ws-proxy/pkg/proxy/routes_test.go
Comment on lines +59 to +67
ideServerHost = "localhost:20000"
workspacePort = uint16(20001)
supervisorPort = uint16(20002)
workspaceDebugPort = uint16(20004)
supervisorDebugPort = uint16(20005)
debugWorkspaceProxyPort = uint16(20006)
workspaceHost = fmt.Sprintf("localhost:%d", workspacePort)
portServeHost = fmt.Sprintf("localhost:%d", workspaces[0].Ports[0].Port)
blobServeHost = "localhost:20003"
Copy link
Contributor

@utam0k utam0k Jan 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

nits: I prefer net.JoinHostPort to fmt.Sprintf

Copy link
Member Author

@akosyakov akosyakov Jan 20, 2023

Choose a reason for hiding this comment

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

thanks for the hint, I will remember it 💡

utam0k
utam0k reviewed Jan 20, 2023
View reviewed changes
@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023

@utam0k @kylos101 do you know when it can be deployed? Other things we can deploy quite quickly, but without this change they don't make sense.

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023 •
edited by werft-gitpod-dev-com bot
Loading

/werft run with-clean-slate-deployment=true

👍 started the job as gitpod-build-ak-debug-ports.2
(with .werft/ from main)

@utam0k
Copy link
Contributor

utam0k commented Jan 20, 2023

@utam0k @kylos101 do you know when it can be deployed? Other things we can deploy quite quickly, but without this change they don't make sense.

Merged by Friday, it will be included in our next deployment. In other words, it will be released from the beginning of next week and will be entirely finished by the end of next week until the traffic shifts.

@utam0k
Copy link
Contributor

utam0k commented Jan 20, 2023

/hold

@utam0k
Copy link
Contributor

utam0k commented Jan 20, 2023

before merge, please pass the our integration test 🙏

@werft-gitpod-dev-com
Copy link

werft-gitpod-dev-com bot commented Jan 20, 2023

started the job as gitpod-build-ak-debug-ports.3 because the annotations in the pull request description changed
(with .werft/ from main)

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023 •
edited by werft-gitpod-dev-com bot
Loading

@utam0k enabled 👍 I also would like to try but I cannot get working preview envs 😢

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023

@utam0k I've enabled test for the workspace team. There can I see results? Should be part of build?

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023

Found, they are passing: https://werft.gitpod-dev.com/job/gitpod-build-ak-debug-ports.3/logs#Run%20integration%20tests:Run%20integration%20tests

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023

I also manually retested for regressions.

@akosyakov
Copy link
Member Author

akosyakov commented Jan 20, 2023

/unhold

manual and integration tests are passing

@roboquat roboquat merged commit 959e584 into main Jan 20, 2023
@roboquat roboquat deleted the ak/debug_ports branch January 20, 2023 08:44
@roboquat roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Jan 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@utam0k utam0k utam0k approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none size/L team: workspace Issue belongs to the Workspace team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@akosyakov @utam0k @roboquat