[ws-manager-api] Remove deprecated fields (#18641)

Author: geropl

components/image-builder-mk3/pkg/orchestrator/orchestrator.go

@@ -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,

components/server/src/workspace/workspace-starter.ts

@@ -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));

components/ws-manager-api/core.proto

@@ -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
@@ -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;
@@ -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;

components/ws-manager-api/go/core.pb.go

@@ -67,7 +67,6 @@ var benchmarkCommand = &cobra.Command{
 			},
 			ServicePrefix: "will-be-overriden",
 			Spec: &api.StartWorkspaceSpec{
-				DeprecatedIdeImage: scenario.IDEImage,
 				IdeImage: &api.IDEImage{
 					WebRef: scenario.IDEImage,
 				},

components/ws-manager-api/typescript/src/core_pb.d.ts

@@ -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",
 				},

components/ws-manager-api/typescript/src/core_pb.js

@@ -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,
 			},