From a9614f73cc2fe6f337810dd855c59e513bf9daf9 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Wed, 2 Dec 2020 18:12:58 +0200 Subject: [PATCH] detect openshift Signed-off-by: Jari Kolehmainen --- .../cluster-detectors/distribution-detector.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/cluster-detectors/distribution-detector.ts b/src/main/cluster-detectors/distribution-detector.ts index b496f2ce00..2279f97e3e 100644 --- a/src/main/cluster-detectors/distribution-detector.ts +++ b/src/main/cluster-detectors/distribution-detector.ts @@ -60,6 +60,14 @@ export class DistributionDetector extends BaseClusterDetector { return { value: "custom", accuracy: 10}; } + if (this.isCustom()) { + return { value: "custom", accuracy: 10}; + } + + if (await this.isOpenshift()) { + return { value: "openshift", accuracy: 90}; + } + return { value: "unknown", accuracy: 10}; } @@ -122,4 +130,14 @@ export class DistributionDetector extends BaseClusterDetector { protected isK3s() { return this.version.includes("+k3s"); } + + protected async isOpenshift() { + try { + const response = await this.k8sRequest(""); + + return response.paths?.find((api: string) => api === "/apis/project.openshift.io") !== undefined; + } catch (e) { + return false; + } + } }