[ws-classes] simplify workspace classes

simplified by
- removing user-level setting
- removing deprecation
- removing ws-class inheritence between ws sessions

Author: svenefftinge

components/dashboard/src/admin/ProjectDetail.tsx

@@ -63,9 +63,6 @@ export default function ProjectDetail(props: { project: Project; owner: string |
                     <Property name="Incremental Prebuilds">
                         {props.project.settings?.useIncrementalPrebuilds ? "Yes" : "No"}
                     </Property>
-                    <Property name="Persistent Volume Claim">
-                        {props.project.settings?.usePersistentVolumeClaim ? "Yes" : "No"}
-                    </Property>
                     <Property name="Marked Deleted">{props.project.markedDeleted ? "Yes" : "No"}</Property>
                 </div>
             </div>

components/dashboard/src/service/service-mock.ts

@@ -219,15 +219,15 @@ const gitpodServiceMock = createServiceMock({
                 displayName: "Standard",
                 description: "Up to 4 vCPU, 8GB memory, 30GB disk",
                 powerups: 1,
-                isSelected: true,
+                isDefault: true,
             },
             {
                 id: "g1-large",
                 category: "GENERAL PURPOSE",
                 displayName: "Large",
                 description: "Up to 8 vCPU, 16GB memory, 50GB disk",
                 powerups: 2,
-                isSelected: false,
+                isDefault: false,
             },
         ];
     },

components/dashboard/src/settings/Preferences.tsx

@@ -11,15 +11,12 @@ import { ThemeContext } from "../theme-context";
 import { UserContext } from "../user-context";
 import { trackEvent } from "../Analytics";
 import SelectIDE from "./SelectIDE";
-import SelectWorkspaceClass from "./selectClass";
 import { PageWithSettingsSubMenu } from "./PageWithSettingsSubMenu";
-import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
-import { WorkspaceClasses } from "@gitpod/gitpod-protocol";
 
 type Theme = "light" | "dark" | "system";
 
 export default function Preferences() {
-    const { user, userBillingMode } = useContext(UserContext);
+    const { user } = useContext(UserContext);
     const { setIsDark } = useContext(ThemeContext);
 
     const [theme, setTheme] = useState<Theme>(localStorage.theme || "system");
@@ -50,30 +47,12 @@ export default function Preferences() {
         }
     };
 
-    const setWorkspaceClass = async (value: string) => {
-        const additionalData = user?.additionalData || {};
-        const prevWorkspaceClass = additionalData?.workspaceClasses?.regular;
-        const workspaceClasses = (additionalData?.workspaceClasses || {}) as WorkspaceClasses;
-        workspaceClasses.regular = value;
-        workspaceClasses.prebuild = value;
-        additionalData.workspaceClasses = workspaceClasses;
-        if (value !== prevWorkspaceClass) {
-            await getGitpodService().server.updateLoggedInUser({ additionalData });
-        }
-        return prevWorkspaceClass;
-    };
-
     return (
         <div>
             <PageWithSettingsSubMenu title="Preferences" subtitle="Configure user preferences.">
                 <h3>Editor</h3>
                 <p className="text-base text-gray-500 dark:text-gray-400">Choose the editor for opening workspaces.</p>
                 <SelectIDE location="preferences" />
-                <SelectWorkspaceClass
-                    workspaceClass={user?.additionalData?.workspaceClasses?.regular}
-                    enabled={BillingMode.canSetWorkspaceClass(userBillingMode)}
-                    setWorkspaceClass={setWorkspaceClass}
-                />
                 <h3 className="mt-12">Theme</h3>
                 <p className="text-base text-gray-500 dark:text-gray-400">Early bird or night owl? Choose your side.</p>
                 <div className="mt-4 space-x-3 flex">

components/dashboard/src/settings/selectClass.tsx

@@ -37,7 +37,7 @@ export default function SelectWorkspaceClass(props: SelectWorkspaceClassProps) {
             setSupportedClasses(classes);
 
             if (!workspaceClass) {
-                setWorkspaceClass(classes.find((c) => c.isSelected)?.id || "");
+                setWorkspaceClass(classes.find((c) => c.isDefault)?.id || "");
             }
         };
 

components/gitpod-protocol/src/teams-projects-protocol.ts

@@ -15,7 +15,6 @@ export interface ProjectConfig {
 
 export interface ProjectSettings {
     useIncrementalPrebuilds?: boolean;
-    usePersistentVolumeClaim?: boolean;
     keepOutdatedPrebuildsRunning?: boolean;
     // whether new workspaces can start on older prebuilds and incrementally update
     allowUsingPreviousPrebuilds?: boolean;

components/gitpod-protocol/src/workspace-class.ts

@@ -10,5 +10,5 @@ export interface SupportedWorkspaceClass {
     displayName: string;
     description: string;
     powerups: number;
-    isSelected: boolean;
+    isDefault: boolean;
 }

components/server/src/config.ts

@@ -16,7 +16,7 @@ import * as fs from "fs";
 import * as yaml from "js-yaml";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { filePathTelepresenceAware } from "@gitpod/gitpod-protocol/lib/env";
-import { WorkspaceClasses, WorkspaceClassesConfig } from "./workspace/workspace-classes";
+import { WorkspaceClassesConfig } from "./workspace/workspace-classes";
 import { PrebuildRateLimiters } from "./workspace/prebuild-rate-limiter";
 
 export const Config = Symbol("Config");
@@ -307,7 +307,12 @@ export namespace ConfigFile {
             }
         }
 
-        WorkspaceClasses.validate(config.workspaceClasses);
+        if (config.workspaceClasses.filter((c) => c.isDefault).length !== 1) {
+            log.error(
+                "Exactly one default workspace class needs to be configured: " +
+                    JSON.stringify(config.workspaceClasses),
+            );
+        }
 
         let patSigningKey = "";
         if (config.patSigningKeyFile) {

components/server/src/workspace/gitpod-server-impl.ts

@@ -174,7 +174,6 @@ import { WorkspaceClusterImagebuilderClientProvider } from "./workspace-cluster-
 import { VerificationService } from "../auth/verification-service";
 import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
 import { EntitlementService } from "../billing/entitlement-service";
-import { WorkspaceClasses } from "./workspace-classes";
 import { formatPhoneNumber } from "../user/phone-numbers";
 import { IDEService } from "../ide-service";
 import { MessageBusIntegration } from "./messagebus-integration";
@@ -2947,25 +2946,15 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     async getSupportedWorkspaceClasses(ctx: TraceContext): Promise<SupportedWorkspaceClass[]> {
-        let user = this.checkAndBlockUser("getSupportedWorkspaceClasses");
-        let selectedClass = await WorkspaceClasses.getConfiguredOrUpgradeFromLegacy(
-            user,
-            undefined,
-            this.config.workspaceClasses,
-            this.entitlementService,
-        );
-
-        let classes = this.config.workspaceClasses
-            .filter((c) => !c.deprecated)
-            .map((c) => ({
-                id: c.id,
-                category: c.category,
-                displayName: c.displayName,
-                description: c.description,
-                powerups: c.powerups,
-                isSelected: selectedClass === c.id,
-            }));
-
+        this.checkAndBlockUser("getSupportedWorkspaceClasses");
+        const classes = this.config.workspaceClasses.map((c) => ({
+            id: c.id,
+            category: c.category,
+            displayName: c.displayName,
+            description: c.description,
+            powerups: c.powerups,
+            isDefault: c.isDefault,
+        }));
         return classes;
     }