Skip to content

Commit 8b94c54

Browse files
easyCZroboquat
authored andcommitted
[ws-manager] Remove Probe workspace type
1 parent 3d017c0 commit 8b94c54

File tree

11 files changed

+80
-649
lines changed

11 files changed

+80
-649
lines changed

components/ws-manager-api/core.proto

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,8 @@ enum WorkspaceType {
644644
// Prebuild workspaces are workspaces used to pre-build the content of other workspaces. They run headless and have no direct user-interaction.
645645
PREBUILD = 1;
646646

647-
// Probe workspaces are used to perform end-to-end health checks on the system. They require little to no resources, run headless and never
648-
// interact with users directly.
649-
PROBE = 2;
647+
// DEPRECATED: Probe workspaces.
648+
reserved 2;
650649

651650
// DEPRECATED Ghost workspaces
652651
reserved 3;

components/ws-manager-api/go/config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ type WorkspacePodTemplateConfiguration struct {
169169
// PrebuildPath is a path to an additional workspace pod template YAML file for prebuild workspaces
170170
PrebuildPath string `json:"prebuildPath,omitempty"`
171171
// ProbePath is a path to an additional workspace pod template YAML file for probe workspaces
172+
// Deprecated
172173
ProbePath string `json:"probePath,omitempty"`
173174
// ImagebuildPath is a path to an additional workspace pod template YAML file for imagebuild workspaces
174175
ImagebuildPath string `json:"imagebuildPath,omitempty"`

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

Lines changed: 77 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-manager/pkg/manager/create.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ func (m *Manager) createWorkspacePod(startContext *startWorkspaceContext) (*core
7070
typeSpecificTpl, err = config.GetWorkspacePodTemplate(templates.RegularPath)
7171
case api.WorkspaceType_PREBUILD:
7272
typeSpecificTpl, err = config.GetWorkspacePodTemplate(templates.PrebuildPath)
73-
case api.WorkspaceType_PROBE:
74-
typeSpecificTpl, err = config.GetWorkspacePodTemplate(templates.ProbePath)
7573
case api.WorkspaceType_IMAGEBUILD:
7674
typeSpecificTpl, err = config.GetWorkspacePodTemplate(templates.ImagebuildPath)
7775
}
@@ -101,8 +99,6 @@ func podName(req *api.StartWorkspaceRequest) string {
10199
switch req.Type {
102100
case api.WorkspaceType_PREBUILD:
103101
prefix = "prebuild"
104-
case api.WorkspaceType_PROBE:
105-
prefix = "probe"
106102
case api.WorkspaceType_IMAGEBUILD:
107103
prefix = "imagebuild"
108104
default:
@@ -251,8 +247,6 @@ func (m *Manager) createPVCForWorkspacePod(startContext *startWorkspaceContext)
251247
switch req.Type {
252248
case api.WorkspaceType_PREBUILD:
253249
prefix = "prebuild"
254-
case api.WorkspaceType_PROBE:
255-
prefix = "probe"
256250
case api.WorkspaceType_IMAGEBUILD:
257251
prefix = "imagebuild"
258252
default:

components/ws-manager/pkg/manager/testdata/cdwp_probe.golden

Lines changed: 0 additions & 273 deletions
This file was deleted.

components/ws-manager/pkg/manager/testdata/cdwp_probe.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

components/ws-manager/pkg/manager/testdata/timeout_probe_Creating00.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)