From de676888bc96e6a45e4b2b36fa6bff479da9c076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 17 Oct 2022 09:42:47 +0200
Subject: [PATCH] add accidentally missing cluster locator config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/rude-tables-shout.md               |  5 +++
 .../{schema.d.ts => config.d.ts}              | 32 ++++++++++++-------
 plugins/kubernetes-backend/package.json       |  4 +--
 3 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/rude-tables-shout.md
 rename plugins/kubernetes-backend/{schema.d.ts => config.d.ts} (94%)

diff --git a/.changeset/rude-tables-shout.md b/.changeset/rude-tables-shout.md
new file mode 100644
index 0000000000..e27af45719
--- /dev/null
+++ b/.changeset/rude-tables-shout.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Added missing cluster locator configuration schema entries, for the catalog and local proxy types
diff --git a/plugins/kubernetes-backend/schema.d.ts b/plugins/kubernetes-backend/config.d.ts
similarity index 94%
rename from plugins/kubernetes-backend/schema.d.ts
rename to plugins/kubernetes-backend/config.d.ts
index 59fa7a5d97..2a514394d8 100644
--- a/plugins/kubernetes-backend/schema.d.ts
+++ b/plugins/kubernetes-backend/config.d.ts
@@ -31,18 +31,6 @@ export interface Config {
       type: 'multiTenant';
     };
     clusterLocatorMethods: Array<
-      | {
-          /** @visibility frontend */
-          type: 'gke';
-          /** @visibility frontend */
-          projectId: string;
-          /** @visibility frontend */
-          region?: string;
-          /** @visibility frontend */
-          skipTLSVerify?: boolean;
-          /** @visibility frontend */
-          skipMetricsLookup?: boolean;
-        }
       | {
           /** @visibility frontend */
           type: 'config';
@@ -68,6 +56,26 @@ export interface Config {
             skipMetricsLookup?: boolean;
           }>;
         }
+      | {
+          /** @visibility frontend */
+          type: 'catalog';
+        }
+      | {
+          /** @visibility frontend */
+          type: 'localKubectlProxy';
+        }
+      | {
+          /** @visibility frontend */
+          type: 'gke';
+          /** @visibility frontend */
+          projectId: string;
+          /** @visibility frontend */
+          region?: string;
+          /** @visibility frontend */
+          skipTLSVerify?: boolean;
+          /** @visibility frontend */
+          skipMetricsLookup?: boolean;
+        }
     >;
     customResources?: Array<{
       group: string;
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 25c112e9b6..7bb9576cb8 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -23,7 +23,7 @@
     "backstage",
     "kubernetes"
   ],
-  "configSchema": "schema.d.ts",
+  "configSchema": "config.d.ts",
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -69,6 +69,6 @@
   },
   "files": [
     "dist",
-    "schema.d.ts"
+    "config.d.ts"
   ]
 }