Skip to content

[ws-manager-api] Remove deprecated ide-related fields #18641

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

Merged
merged 1 commit into from
Sep 1, 2023
Merged

[ws-manager-api] Remove deprecated ide-related fields #18641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions components/image-builder-mk3/pkg/orchestrator/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,9 @@ func (o *Orchestrator) Build(req *protocol.BuildRequest, resp protocol.ImageBuil
Owner: req.GetTriggeredBy(),
},
Spec: &wsmanapi.StartWorkspaceSpec{
Initializer: initializer,
Timeout: maxBuildRuntime.String(),
WorkspaceImage: o.Config.BuilderImage,
DeprecatedIdeImage: o.Config.BuilderImage,
Initializer: initializer,
Timeout: maxBuildRuntime.String(),
WorkspaceImage: o.Config.BuilderImage,
IdeImage: &wsmanapi.IDEImage{
WebRef: o.Config.BuilderImage,
SupervisorRef: req.SupervisorRef,
Expand Down
1 change: 0 additions & 1 deletion components/server/src/workspace/workspace-starter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,6 @@ export class WorkspaceStarter {
startWorkspaceSpecIDEImage.setSupervisorRef(ideConfig.supervisorImage);
spec.setIdeImage(startWorkspaceSpecIDEImage);
spec.setIdeImageLayersList(ideConfig.ideImageLayers);
spec.setDeprecatedIdeImage(ideConfig.webImage);
spec.setWorkspaceImage(instance.workspaceImage);
spec.setWorkspaceLocation(workspace.config.workspaceLocation || checkoutLocation);
spec.setFeatureFlagsList(this.toWorkspaceFeatureFlags(featureFlags));
Expand Down
8 changes: 4 additions & 4 deletions components/ws-manager-api/core.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ message IDEImage {
// web_ref is a reference to an OCI image used for serving the web-based IDE
string web_ref = 1;
// DEPRECATED desktop_ref is an optional reference to an OCI image used for serving desktop IDEs
string desktop_ref = 2;
reserved 2;
// supervisor_ref is a reference to an OCI image used as supervisor
string supervisor_ref = 3;
// DEPRECATED desktop_plugin_ref is an optional reference to an OCI image used for serving desktop IDE plugin
string desktop_plugin_ref = 4;
reserved 4;
}

// WorkspaceSpec is the specification of a workspace at runtime
Expand All @@ -342,7 +342,7 @@ message WorkspaceSpec {

// deprecated_ide_image is a field present for backwards compatibility and the same
// as IDEImage.web_ref. If both fields are present, IDEImage.web_ref takes precedence.
string deprecated_ide_image = 2;
reserved 2;

// headless marks this workspace a headless one - headless workspaces are not intended for users but for automation
bool headless = 3;
Expand Down Expand Up @@ -559,7 +559,7 @@ message StartWorkspaceSpec {

// deprecated_ide_image is a field present for backwards compatibility and the same
// as IDEImage.web_ref. If both fields are present, IDEImage.web_ref takes precedence.
string deprecated_ide_image = 2;
reserved 2;

// feature_flags provide a means for starting variants of workspaces (e.g. a privileged one)
repeated WorkspaceFeatureFlag feature_flags = 3;
Expand Down
499 changes: 226 additions & 273 deletions components/ws-manager-api/go/core.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions components/ws-manager-api/typescript/src/core_pb.d.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

122 changes: 1 addition & 121 deletions components/ws-manager-api/typescript/src/core_pb.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion dev/loadgen/cmd/benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ var benchmarkCommand = &cobra.Command{
},
ServicePrefix: "will-be-overriden",
Spec: &api.StartWorkspaceSpec{
DeprecatedIdeImage: scenario.IDEImage,
IdeImage: &api.IDEImage{
WebRef: scenario.IDEImage,
},
Expand Down
1 change: 0 additions & 1 deletion dev/loadgen/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ var runCmd = &cobra.Command{
},
ServicePrefix: "will-be-overriden",
Spec: &api.StartWorkspaceSpec{
DeprecatedIdeImage: "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-8c1466008dedabe79d82cbb91931a16f7ce7994c",
IdeImage: &api.IDEImage{
WebRef: "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-8c1466008dedabe79d82cbb91931a16f7ce7994c",
},
Expand Down
3 changes: 1 addition & 2 deletions test/pkg/integration/workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,7 @@ func LaunchWorkspaceDirectly(t *testing.T, ctx context.Context, api *ComponentAP
},
Type: wsmanapi.WorkspaceType_REGULAR,
Spec: &wsmanapi.StartWorkspaceSpec{
WorkspaceImage: workspaceImage,
DeprecatedIdeImage: ideImage,
WorkspaceImage: workspaceImage,
IdeImage: &wsmanapi.IDEImage{
WebRef: ideImage,
},
Expand Down