Disable kubectl download mirror options when not available (#3956)

This commit is contained in:
Sebastian Malton authored and GitHub committed 2021-10-19 09:22:06 -04:00
1 parent 125a073007
commit cbffb85650
3 files changed
+32 -17

No files matched your search

+4 -10
View File
@@ -32,6 +32,7 @@ import { getBundledKubectlVersion } from "../common/utils/app-version";
import { isDevelopment, isWindows, isTestEnv } from "../common/vars";
import { SemVer } from "semver";
import { getPath } from "../common/utils/getPath";
import { defaultPackageMirror, packageMirrors } from "../common/user-store/preferences-helpers";
const bundledVersion = getBundledKubectlVersion();
const kubectlMap: Map<string, string> = new Map([
@@ -51,10 +52,6 @@ const kubectlMap: Map<string, string> = new Map([
["1.20", "1.20.8"],
["1.21", bundledVersion]
]);
const packageMirrors: Map<string, string> = new Map([
["default", "https://storage.googleapis.com/kubernetes-release/release"],
["china", "https://mirror.azure.cn/kubernetes/kubectl"]
]);
let bundledPath: string;
const initScriptVersionString = "# lens-initscript v3\n";
@@ -389,12 +386,9 @@ export class Kubectl {
}
protected getDownloadMirror() {
const mirror = packageMirrors.get(UserStore.getInstance().downloadMirror);
// MacOS packages are only available from default
if (mirror) {
return mirror;
}
return packageMirrors.get("default"); // MacOS packages are only available from default
return packageMirrors.get(UserStore.getInstance().downloadMirror)
?? packageMirrors.get(defaultPackageMirror);
}
}