From bc74fb6998c39cce54bf7b91ed0ca7914ec013ab Mon Sep 17 00:00:00 2001
From: Andrew Farries <andrew@gitpod.io>
Date: Thu, 20 Oct 2022 11:21:43 +0000
Subject: [PATCH 1/2] Revert "Extend WorkspaceClusterFilter in gitpod-protocol"

This reverts commit 7e550ef03a46aa454093a51c61698efc13d9e78c.
---
 components/gitpod-protocol/src/workspace-cluster.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/gitpod-protocol/src/workspace-cluster.ts b/components/gitpod-protocol/src/workspace-cluster.ts
index 30c047d038a3eb..8725ed730dc052 100644
--- a/components/gitpod-protocol/src/workspace-cluster.ts
+++ b/components/gitpod-protocol/src/workspace-cluster.ts
@@ -104,7 +104,6 @@ export interface WorkspaceClusterDB {
      */
     findFiltered(predicate: DeepPartial<WorkspaceClusterFilter>): Promise<WorkspaceClusterWoTLS[]>;
 }
-export interface WorkspaceClusterFilter
-    extends Pick<WorkspaceCluster, "name" | "state" | "govern" | "url" | "applicationCluster"> {
+export interface WorkspaceClusterFilter extends Pick<WorkspaceCluster, "state" | "govern" | "url"> {
     minScore: number;
 }

From 17531ae098f1098084e58ce1284a635ee7704483 Mon Sep 17 00:00:00 2001
From: Andrew Farries <andrew@gitpod.io>
Date: Thu, 20 Oct 2022 11:21:56 +0000
Subject: [PATCH 2/2] Revert "Make client providers filter by app cluster"

This reverts commit 83a33cbad6e4acf004ecf475df9bf04c3e50d998.
---
 .../typescript/src/client-provider-source.ts        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/ws-manager-api/typescript/src/client-provider-source.ts b/components/ws-manager-api/typescript/src/client-provider-source.ts
index e4771439343f46..416bf85c4d4096 100644
--- a/components/ws-manager-api/typescript/src/client-provider-source.ts
+++ b/components/ws-manager-api/typescript/src/client-provider-source.ts
@@ -14,17 +14,17 @@ export interface WorkspaceManagerClientProviderSource {
     getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]>;
 }
 
+
 @injectable()
 export class WorkspaceManagerClientProviderEnvSource implements WorkspaceManagerClientProviderSource {
     protected _clusters: WorkspaceCluster[] | undefined = undefined;
-    readonly applicationCluster = process.env.GITPOD_INSTALLATION_SHORTNAME ?? "";
 
     public async getWorkspaceCluster(name: string): Promise<WorkspaceCluster | undefined> {
-        return this.clusters.find((m) => m.name === name && m.applicationCluster === this.applicationCluster);
+        return this.clusters.find(m => m.name === name);
     }
 
     public async getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]> {
-        return this.clusters.filter((m) => m.applicationCluster === this.applicationCluster) ?? [];
+        return this.clusters;
     }
 
     protected get clusters(): WorkspaceCluster[] {
@@ -63,14 +63,13 @@ export class WorkspaceManagerClientProviderEnvSource implements WorkspaceManager
 export class WorkspaceManagerClientProviderDBSource implements WorkspaceManagerClientProviderSource {
     @inject(WorkspaceClusterDB)
     protected readonly db: WorkspaceClusterDB;
-    readonly applicationCluster = process.env.GITPOD_INSTALLATION_SHORTNAME ?? "";
 
     public async getWorkspaceCluster(name: string): Promise<WorkspaceCluster | undefined> {
-        return (await this.db.findFiltered({ name, applicationCluster: this.applicationCluster }))[0];
+        return await this.db.findByName(name);
     }
 
     public async getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]> {
-        return await this.db.findFiltered({ applicationCluster: this.applicationCluster });
+        return await this.db.findFiltered({});
     }
 }
 
@@ -106,4 +105,4 @@ export class WorkspaceManagerClientProviderCompositeSource implements WorkspaceM
         }
         return result;
     }
-}
+}
\ No newline at end of file