lensapp/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2024-09-20 05:47:24 +03:00
Code Issues Projects Releases Wiki Activity

ignore prerelease tag for kubectl version to download (#6299)

Browse Source 
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
Jim Ehrismann 2022-10-04 15:33:18 -04:00 committed by GitHub
parent 0fe3242030
commit 07d03d3844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kubectl/kubectl.ts
View File

@ -9,7 +9,7 @@ import { promiseExecFile } from "../../common/utils/promise-exec";
import logger from "../logger";
import { ensureDir, pathExists } from "fs-extra";
import * as lockFile from "proper-lockfile";
import { SemVer } from "semver";
import { SemVer, coerce } from "semver";
import { defaultPackageMirror, packageMirrors } from "../../common/user-store/preferences-helpers";
import got from "got/dist/source";
import { promisify } from "util";
@ -45,11 +45,12 @@ export class Kubectl {
constructor(protected readonly dependencies: KubectlDependencies, clusterVersion: string) {
let version: SemVer;
const bundledVersion = new SemVer(this.dependencies.bundledKubectlVersion);
try {
version = new SemVer(clusterVersion);
} catch {
version = new SemVer(this.dependencies.bundledKubectlVersion);
version = bundledVersion;
}
const fromMajorMinor = this.dependencies.kubectlVersionMap.get(`${version.major}.${version.minor}`);
@ -62,7 +63,10 @@ export class Kubectl {
this.kubectlVersion = fromMajorMinor;
logger.debug(`Set kubectl version ${this.kubectlVersion} for cluster version ${clusterVersion} using version map`);
} else {
this.kubectlVersion = version.format();
/* this is the version (without possible prelease tag) to get from the download mirror */
const ver = coerce(version.format()) ?? bundledVersion;
this.kubectlVersion = ver.format();
logger.debug(`Set kubectl version ${this.kubectlVersion} for cluster version ${clusterVersion} using fallback`);
}