[ws-manager] Introduce workspace classes

.werft/jobs/build/installer/post-process.sh

@@ -183,8 +183,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
       | jq --arg REGISTRY_FACADE_HOST "$REGISTRY_FACADE_HOST" '.manager.registryFacadeHost = $REGISTRY_FACADE_HOST' \
       | jq ".manager.wsdaemon.port = $WS_DAEMON_PORT" > /tmp/"$NAME"-cm-overrides.json
 
-      yq w -i -j /tmp/"$NAME"-cm-overrides.json manager.podTemplate.defaultPath /workspace-templates/default.yaml
-
       touch /tmp/"$NAME"-cm-overrides.yaml
       # write a yaml file with the json as a multiline string
       yq w -i /tmp/"$NAME"-cm-overrides.yaml "data.[config.json]" -- "$(< /tmp/"$NAME"-cm-overrides.json)"

components/ws-daemon-api/daemon.proto

@@ -52,6 +52,9 @@ message InitWorkspaceRequest {
     // remote_storage_disabled disables any support for remote storage operations, specifically backups and snapshots.
     // When any such operation is attempted, a FAILED_PRECONDITION error will be the result.
     bool remote_storage_disabled = 7;
+
+    // storage_quota_bytes enforces a storage quate for the workspace if set to a value != 0
+    int64 storage_quota_bytes = 8;
 }
 
 // WorkspaceMetadata is data associated with a workspace that's required for other parts of the system to function

components/ws-daemon-api/typescript/src/daemon_pb.d.ts

@@ -13,7 +13,7 @@
 import * as jspb from "google-protobuf";
 import * as content_service_api_initializer_pb from "@gitpod/content-service/lib";
 
-export class InitWorkspaceRequest extends jspb.Message { 
+export class InitWorkspaceRequest extends jspb.Message {
     getId(): string;
     setId(value: string): InitWorkspaceRequest;
 
@@ -34,6 +34,8 @@ export class InitWorkspaceRequest extends jspb.Message {
     setContentManifest(value: Uint8Array | string): InitWorkspaceRequest;
     getRemoteStorageDisabled(): boolean;
     setRemoteStorageDisabled(value: boolean): InitWorkspaceRequest;
+    getStorageQuotaBytes(): number;
+    setStorageQuotaBytes(value: number): InitWorkspaceRequest;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): InitWorkspaceRequest.AsObject;
@@ -53,10 +55,11 @@ export namespace InitWorkspaceRequest {
         fullWorkspaceBackup: boolean,
         contentManifest: Uint8Array | string,
         remoteStorageDisabled: boolean,
+        storageQuotaBytes: number,
     }
 }
 
-export class WorkspaceMetadata extends jspb.Message { 
+export class WorkspaceMetadata extends jspb.Message {
     getOwner(): string;
     setOwner(value: string): WorkspaceMetadata;
     getMetaId(): string;
@@ -79,7 +82,7 @@ export namespace WorkspaceMetadata {
     }
 }
 
-export class InitWorkspaceResponse extends jspb.Message { 
+export class InitWorkspaceResponse extends jspb.Message {
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): InitWorkspaceResponse.AsObject;
@@ -96,7 +99,7 @@ export namespace InitWorkspaceResponse {
     }
 }
 
-export class WaitForInitRequest extends jspb.Message { 
+export class WaitForInitRequest extends jspb.Message {
     getId(): string;
     setId(value: string): WaitForInitRequest;
 
@@ -116,7 +119,7 @@ export namespace WaitForInitRequest {
     }
 }
 
-export class WaitForInitResponse extends jspb.Message { 
+export class WaitForInitResponse extends jspb.Message {
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): WaitForInitResponse.AsObject;
@@ -133,7 +136,7 @@ export namespace WaitForInitResponse {
     }
 }
 
-export class TakeSnapshotRequest extends jspb.Message { 
+export class TakeSnapshotRequest extends jspb.Message {
     getId(): string;
     setId(value: string): TakeSnapshotRequest;
     getReturnImmediately(): boolean;
@@ -156,7 +159,7 @@ export namespace TakeSnapshotRequest {
     }
 }
 
-export class TakeSnapshotResponse extends jspb.Message { 
+export class TakeSnapshotResponse extends jspb.Message {
     getUrl(): string;
     setUrl(value: string): TakeSnapshotResponse;
 
@@ -176,7 +179,7 @@ export namespace TakeSnapshotResponse {
     }
 }
 
-export class DisposeWorkspaceRequest extends jspb.Message { 
+export class DisposeWorkspaceRequest extends jspb.Message {
     getId(): string;
     setId(value: string): DisposeWorkspaceRequest;
     getBackup(): boolean;
@@ -202,7 +205,7 @@ export namespace DisposeWorkspaceRequest {
     }
 }
 
-export class DisposeWorkspaceResponse extends jspb.Message { 
+export class DisposeWorkspaceResponse extends jspb.Message {
 
     hasGitStatus(): boolean;
     clearGitStatus(): void;
@@ -225,7 +228,7 @@ export namespace DisposeWorkspaceResponse {
     }
 }
 
-export class BackupWorkspaceRequest extends jspb.Message { 
+export class BackupWorkspaceRequest extends jspb.Message {
     getId(): string;
     setId(value: string): BackupWorkspaceRequest;
 
@@ -245,7 +248,7 @@ export namespace BackupWorkspaceRequest {
     }
 }
 
-export class BackupWorkspaceResponse extends jspb.Message { 
+export class BackupWorkspaceResponse extends jspb.Message {
     getUrl(): string;
     setUrl(value: string): BackupWorkspaceResponse;
 

components/ws-daemon-api/typescript/src/daemon_pb.js

@@ -303,7 +303,8 @@ proto.wsdaemon.InitWorkspaceRequest.toObject = function(includeInstance, msg) {
     initializer: (f = msg.getInitializer()) && content$service$api_initializer_pb.WorkspaceInitializer.toObject(includeInstance, f),
     fullWorkspaceBackup: jspb.Message.getBooleanFieldWithDefault(msg, 4, false),
     contentManifest: msg.getContentManifest_asB64(),
-    remoteStorageDisabled: jspb.Message.getBooleanFieldWithDefault(msg, 7, false)
+    remoteStorageDisabled: jspb.Message.getBooleanFieldWithDefault(msg, 7, false),
+    storageQuotaBytes: jspb.Message.getFieldWithDefault(msg, 8, 0)
   };
 
   if (includeInstance) {
@@ -366,6 +367,10 @@ proto.wsdaemon.InitWorkspaceRequest.deserializeBinaryFromReader = function(msg,
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setRemoteStorageDisabled(value);
       break;
+    case 8:
+      var value = /** @type {number} */ (reader.readInt64());
+      msg.setStorageQuotaBytes(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -439,6 +444,13 @@ proto.wsdaemon.InitWorkspaceRequest.serializeBinaryToWriter = function(message,
       f
     );
   }
+  f = message.getStorageQuotaBytes();
+  if (f !== 0) {
+    writer.writeInt64(
+      8,
+      f
+    );
+  }
 };
 
 
@@ -612,6 +624,24 @@ proto.wsdaemon.InitWorkspaceRequest.prototype.setRemoteStorageDisabled = functio
 };
 
 
+/**
+ * optional int64 storage_quota_bytes = 8;
+ * @return {number}
+ */
+proto.wsdaemon.InitWorkspaceRequest.prototype.getStorageQuotaBytes = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 8, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.wsdaemon.InitWorkspaceRequest} returns this
+ */
+proto.wsdaemon.InitWorkspaceRequest.prototype.setStorageQuotaBytes = function(value) {
+  return jspb.Message.setProto3IntField(this, 8, value);
+};
+
+
 
 
 

components/ws-daemon/pkg/content/config.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gitpod-io/gitpod/common-go/util"
 	cntntcfg "github.com/gitpod-io/gitpod/content-service/api/config"
 	"github.com/gitpod-io/gitpod/ws-daemon/api"
-	"github.com/gitpod-io/gitpod/ws-daemon/pkg/quota"
 	"golang.org/x/xerrors"
 )
 
@@ -29,9 +28,6 @@ type Config struct {
 	// TmpDir is the temp working diretory for creating tar files during upload
 	TmpDir string `json:"tempDir"`
 
-	// Limit limits the size of a sandbox
-	WorkspaceSizeLimit quota.Size `json:"workspaceSizeLimit"`
-
 	// Storage is some form of permanent file store to which we back up workspaces
 	Storage cntntcfg.StorageConfig `json:"storage"`
 

components/ws-daemon/pkg/content/hooks.go

@@ -28,12 +28,12 @@ func workspaceLifecycleHooks(cfg Config, kubernetesNamespace string, workspaceEx
 		session.WorkspaceInitializing: {
 			hookSetupRemoteStorage(cfg),
 			hookSetupWorkspaceLocation,
-			hookInstallQuota(xfs, cfg.WorkspaceSizeLimit),
+			hookInstallQuota(xfs),
 			startIWS,
 		},
 		session.WorkspaceReady: {
 			hookSetupRemoteStorage(cfg),
-			hookInstallQuota(xfs, cfg.WorkspaceSizeLimit),
+			hookInstallQuota(xfs),
 			startIWS,
 		},
 		session.WorkspaceDisposed: {
@@ -93,11 +93,12 @@ func hookSetupWorkspaceLocation(ctx context.Context, ws *session.Workspace) erro
 }
 
 // hookInstallQuota enforces filesystem quota on the workspace location (if the filesystem supports it)
-func hookInstallQuota(xfs *quota.XFS, size quota.Size) session.WorkspaceLivecycleHook {
+func hookInstallQuota(xfs *quota.XFS) session.WorkspaceLivecycleHook {
 	return func(ctx context.Context, ws *session.Workspace) error {
 		if xfs == nil {
 			return nil
 		}
+		size := quota.Size(ws.StorageQuota)
 		if size == 0 {
 			return nil
 		}

components/ws-daemon/pkg/content/service.go

@@ -261,6 +261,7 @@ func (s *WorkspaceService) creator(req *api.InitWorkspaceRequest) session.Worksp
 			FullWorkspaceBackup:   req.FullWorkspaceBackup,
 			ContentManifest:       req.ContentManifest,
 			RemoteStorageDisabled: req.RemoteStorageDisabled,
+			StorageQuota:          int(req.StorageQuotaBytes),
 
 			ServiceLocDaemon: filepath.Join(s.config.WorkingArea, ServiceDirName(req.Id)),
 			ServiceLocNode:   filepath.Join(s.config.WorkingAreaNode, ServiceDirName(req.Id)),

components/ws-daemon/pkg/internal/session/workspace.go

@@ -68,6 +68,7 @@ type Workspace struct {
 	ServiceLocDaemon string `json:"serviceLocDaemon"`
 
 	RemoteStorageDisabled bool `json:"remoteStorageDisabled,omitempty"`
+	StorageQuota          int  `json:"storageQuota,omitempty"`
 
 	XFSProjectID int `json:"xfsProjectID"`
 

components/ws-manager-api/core.proto

@@ -307,6 +307,9 @@ message WorkspaceSpec {
 
     // ide_image is the name of the Docker image used as IDE
     IDEImage ide_image = 8;
+
+    // class names the class of this workspace
+    string class = 9;
 }
 
 // PortSpec describes a networking port exposed on a workspace
@@ -493,6 +496,9 @@ message StartWorkspaceSpec {
 
     // ide_image is the Docker image name of the IDE image
     IDEImage ide_image = 12;
+
+    // Class denotes the class of the workspace we ought to start
+    string class = 13;
 }
 
 // WorkspaceFeatureFlag enable non-standard behaviour in workspaces