Skip to content

[ws-proxy] Get supervisor image from pod annotation instead from ws-proxy config #6697

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

Merged
merged 1 commit into from
Nov 15, 2021

Conversation

corneliusludmann
Copy link
Contributor

@corneliusludmann corneliusludmann commented Nov 14, 2021

Description

This PR removes the ws-proxy config value that specifies the supervisor image. Instead of using this config value, the supervisor image from the ImageSpec annotation is used. This …

  1. allows deploying new supervisor images without the need to change the ws-proxy config + pod restart, and
  2. supports that workspaces use different supervisor images.

Related Issue(s)

Fixes #6512

How to test

  • Make sure the unit tests pass
  • Start a workspace, make sure there is no such error in the ws-proxy logs like no workspace information available - cannot resolve supervisor route

Release Notes

NONE

@codecov
Copy link

codecov bot commented Nov 14, 2021

Codecov Report

Merging #6697 (96be1b2) into main (70bb65b) will increase coverage by 1.34%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #6697      +/-   ##
==========================================
+ Coverage   36.69%   38.04%   +1.34%     
==========================================
  Files          21       20       -1     
  Lines        4745     2195    -2550     
==========================================
- Hits         1741      835     -906     
+ Misses       2868     1309    -1559     
+ Partials      136       51      -85     
Flag Coverage Δ
components-local-app-app-linux-amd64 ?
components-local-app-app-linux-arm64 ?
components-local-app-app-windows-386 ?
components-local-app-app-windows-amd64 ?
components-local-app-app-windows-arm64 ?
components-supervisor-app ?
components-ws-proxy-app 69.25% <50.00%> (?)
installer-raw-app 6.16% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
components/ws-proxy/pkg/proxy/config.go 37.75% <0.00%> (ø)
components/ws-proxy/pkg/proxy/infoprovider.go 4.90% <0.00%> (ø)
components/ws-proxy/pkg/proxy/routes.go 82.99% <67.56%> (ø)
components/supervisor/pkg/ports/slirp4netns.go
components/supervisor/pkg/supervisor/ssh.go
components/supervisor/pkg/terminal/terminal.go
components/local-app/pkg/auth/auth.go
components/supervisor/pkg/ports/served-ports.go
components/supervisor/pkg/ports/ports-config.go
components/supervisor/pkg/supervisor/config.go
... and 34 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 70bb65b...96be1b2. Read the comment docs.

@corneliusludmann corneliusludmann force-pushed the clu/ws-proxy-supervisor-imagespec branch from 660ff1f to 96be1b2 Compare November 14, 2021 18:20
@corneliusludmann corneliusludmann marked this pull request as ready for review November 14, 2021 18:35
@csweichel
Copy link
Contributor

csweichel commented Nov 15, 2021

Works as advertised and code LGTM.

/hold
/lgtm

@roboquat
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4fe75a85cceebbc7b2e285f18ec52db307c91790

@roboquat
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csweichel

Associated issue: #6512

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@csweichel
Copy link
Contributor

/hold cancel

@roboquat roboquat merged commit 47d4ac5 into main Nov 15, 2021
@roboquat roboquat deleted the clu/ws-proxy-supervisor-imagespec branch November 15, 2021 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deploy supervisor image via server ide config
3 participants