From 39951729e661f23d351455ab890c35d506ccb857 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Wed, 23 Dec 2020 11:13:46 +0200 Subject: [PATCH] Change method orders to avoid conflicts Signed-off-by: Lauri Nevala --- .../cluster-detectors/distribution-detector.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/cluster-detectors/distribution-detector.ts b/src/main/cluster-detectors/distribution-detector.ts index 2843d97028..86cf24e6f4 100644 --- a/src/main/cluster-detectors/distribution-detector.ts +++ b/src/main/cluster-detectors/distribution-detector.ts @@ -36,14 +36,14 @@ export class DistributionDetector extends BaseClusterDetector { return { value: "digitalocean", accuracy: 90}; } - if (this.isMirantis()) { - return { value: "mirantis", accuracy: 90}; - } - if (this.isVMWare()) { return { value: "vmware", accuracy: 90}; } + if (this.isMirantis()) { + return { value: "mirantis", accuracy: 90}; + } + if (this.isHuawei()) { return { value: "huawei", accuracy: 90}; } @@ -127,6 +127,10 @@ export class DistributionDetector extends BaseClusterDetector { return this.version.includes("+"); } + protected isVMWare() { + return this.version.includes("+vmware"); + } + protected isRke() { return this.version.includes("-rancher"); } @@ -135,10 +139,6 @@ export class DistributionDetector extends BaseClusterDetector { return this.version.includes("+k3s"); } - protected isVMWare() { - return this.version.includes("+vmware"); - } - protected isHuawei() { return this.version.includes("-CCE"); }