From 120c133e3ba877753e559e39ec4a12be199dbde8 Mon Sep 17 00:00:00 2001
From: kim5566 <28945404+kim5566@users.noreply.github.com>
Date: Thu, 20 Jan 2022 09:45:09 +1100
Subject: [PATCH 1/4] if serviceAccountToken not provided use default

Signed-off-by: kim5566 <28945404+kim5566@users.noreply.github.com>
---
 .../src/service/KubernetesClientProvider.ts     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/kubernetes-backend/src/service/KubernetesClientProvider.ts b/plugins/kubernetes-backend/src/service/KubernetesClientProvider.ts
index 031e40547c..bd06016f78 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesClientProvider.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesClientProvider.ts
@@ -45,12 +45,17 @@ export class KubernetesClientProvider {
     };
 
     const kc = new KubeConfig();
-    kc.loadFromOptions({
-      clusters: [cluster],
-      users: [user],
-      contexts: [context],
-      currentContext: context.name,
-    });
+    if (clusterDetails.serviceAccountToken) {
+      kc.loadFromOptions({
+        clusters: [cluster],
+        users: [user],
+        contexts: [context],
+        currentContext: context.name,
+      });
+    } else {
+      kc.loadFromDefault();
+    }
+
     return kc;
   }
 

From 8fc0d122e8f7dec5f65c36088e3975b0ff8b7337 Mon Sep 17 00:00:00 2001
From: kim5566 <28945404+kim5566@users.noreply.github.com>
Date: Thu, 20 Jan 2022 09:49:24 +1100
Subject: [PATCH 2/4] add changeset

Signed-off-by: kim5566 <28945404+kim5566@users.noreply.github.com>
---
 .changeset/eleven-eagles-do.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/eleven-eagles-do.md

diff --git a/.changeset/eleven-eagles-do.md b/.changeset/eleven-eagles-do.md
new file mode 100644
index 0000000000..339ee038a2
--- /dev/null
+++ b/.changeset/eleven-eagles-do.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+If serviceAccountToken not provided, use defaul kubeconfig from cluster

From 278baee51453c2b59fc79ff7d71da99b84f57343 Mon Sep 17 00:00:00 2001
From: kim5566 <28945404+kim5566@users.noreply.github.com>
Date: Thu, 20 Jan 2022 10:37:10 +1100
Subject: [PATCH 3/4] update changeset

Signed-off-by: kim5566 <28945404+kim5566@users.noreply.github.com>
---
 .changeset/eleven-eagles-do.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/eleven-eagles-do.md b/.changeset/eleven-eagles-do.md
index 339ee038a2..9e3d630158 100644
--- a/.changeset/eleven-eagles-do.md
+++ b/.changeset/eleven-eagles-do.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-kubernetes-backend': patch
 ---
 
-If serviceAccountToken not provided, use defaul kubeconfig from cluster
+If serviceAccountToken not provided, use default Kube configuration from cluster

From 427fa5de82b3eb1c8429ef05c3ea0b1a650a1632 Mon Sep 17 00:00:00 2001
From: kim5566 <28945404+kim5566@users.noreply.github.com>
Date: Thu, 20 Jan 2022 10:42:43 +1100
Subject: [PATCH 4/4] update changeset

Signed-off-by: kim5566 <28945404+kim5566@users.noreply.github.com>
---
 .changeset/eleven-eagles-do.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/eleven-eagles-do.md b/.changeset/eleven-eagles-do.md
index 9e3d630158..a05cace224 100644
--- a/.changeset/eleven-eagles-do.md
+++ b/.changeset/eleven-eagles-do.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-kubernetes-backend': patch
 ---
 
-If serviceAccountToken not provided, use default Kube configuration from cluster
+If serviceAccountToken not provided, use default config file from cluster