Remove fixed resources

components/gitpod-protocol/src/protocol.ts

@@ -271,7 +271,6 @@ export interface UserFeatureSettings {
  */
 export const WorkspaceFeatureFlags = {
     full_workspace_backup: undefined,
-    fixed_resources: undefined,
     persistent_volume_claim: undefined,
     protected_secrets: undefined,
 };

components/server/ee/src/user/eligibility-service.ts

@@ -265,21 +265,6 @@ export class EligibilityService {
         }
     }
 
-    /**
-     * Returns true if the user is never subject to CPU limiting
-     */
-    async hasFixedWorkspaceResources(user: User, date: Date = new Date()): Promise<boolean> {
-        const subscriptions = await this.subscriptionService.getNotYetCancelledSubscriptions(user, date.toISOString());
-        const eligblePlans = [
-            Plans.PROFESSIONAL_EUR,
-            Plans.PROFESSIONAL_USD,
-            Plans.TEAM_PROFESSIONAL_EUR,
-            Plans.TEAM_PROFESSIONAL_USD,
-        ].map((p) => p.chargebeeId);
-
-        return subscriptions.filter((s) => eligblePlans.includes(s.planId!)).length > 0;
-    }
-
     /**
      * Returns true if the user ought to land on a workspace cluster that provides more resources
      * compared to the default case.

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

@@ -4,13 +4,7 @@
  * See License.enterprise.txt in the project root folder.
  */
 
-import {
-    Workspace,
-    User,
-    WorkspaceInstance,
-    WorkspaceInstanceConfiguration,
-    NamedWorkspaceFeatureFlag,
-} from "@gitpod/gitpod-protocol";
+import { Workspace, User, WorkspaceInstance, NamedWorkspaceFeatureFlag } from "@gitpod/gitpod-protocol";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { inject, injectable } from "inversify";
 import { IDEConfig } from "../../../src/ide-config";
@@ -44,13 +38,6 @@ export class WorkspaceStarterEE extends WorkspaceStarter {
             ideConfig,
             forcePVC,
         );
-        if (await this.eligibilityService.hasFixedWorkspaceResources(user)) {
-            const config: WorkspaceInstanceConfiguration = instance.configuration!;
-            const ff = config.featureFlags || [];
-            ff.push("fixed_resources");
-            config.featureFlags = ff;
-            instance.configuration = config;
-        }
 
         return instance;
     }

components/ws-manager-api/core.proto

@@ -585,9 +585,9 @@ enum WorkspaceFeatureFlag {
     // the registry facade and back them up using regular "hardlink backups".
     FULL_WORKSPACE_BACKUP = 4;
 
-    // FixedResources ensures this workspace is not subject to ws-daemon's dynamic resource limits.
+    // Was used to ensure a workspace is not subject to ws-daemon's dynamic resource limits.
     // In this sence it's akin to "guaranteed" (as compared to burstable) resources for workspaces.
-    FIXED_RESOURCES = 5;
+    reserved 5;
 
     // Was used for UserNamespace
     reserved 6;

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

@@ -1259,7 +1259,6 @@ export enum WorkspacePhase {
 export enum WorkspaceFeatureFlag {
     NOOP = 0,
     FULL_WORKSPACE_BACKUP = 4,
-    FIXED_RESOURCES = 5,
     PERSISTENT_VOLUME_CLAIM = 7,
     PROTECTED_SECRETS = 8,
 }

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

@@ -9804,7 +9804,6 @@ proto.wsman.WorkspacePhase = {
 proto.wsman.WorkspaceFeatureFlag = {
   NOOP: 0,
   FULL_WORKSPACE_BACKUP: 4,
-  FIXED_RESOURCES: 5,
   PERSISTENT_VOLUME_CLAIM: 7,
   PROTECTED_SECRETS: 8
 };

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

@@ -557,16 +557,6 @@ func (m *Manager) createDefiniteWorkspacePod(startContext *startWorkspaceContext
 			removeVolume(&pod, workspaceVolumeName)
 			pod.Labels[fullWorkspaceBackupLabel] = util.BooleanTrueString
 
-		case api.WorkspaceFeatureFlag_FIXED_RESOURCES:
-			var cpuLimit string
-			for _, c := range pod.Spec.Containers {
-				if c.Name != "workspace" {
-					continue
-				}
-				cpuLimit = c.Resources.Limits.Cpu().String()
-			}
-			pod.Annotations[wsk8s.CPULimitAnnotation] = cpuLimit
-
 		case api.WorkspaceFeatureFlag_NOOP:
 
 		case api.WorkspaceFeatureFlag_PERSISTENT_VOLUME_CLAIM: