diff --git a/src/common/user-store/preferences-helpers.ts b/src/common/user-store/preferences-helpers.ts index fe0007ae45..f30be368d8 100644 --- a/src/common/user-store/preferences-helpers.ts +++ b/src/common/user-store/preferences-helpers.ts @@ -141,8 +141,8 @@ export interface DownloadMirror { platforms: Set; } -const defaultPackageMirror = "default"; -const packageMirrors = new Map([ +export const defaultPackageMirror = "default"; +export const packageMirrors = new Map([ [defaultPackageMirror, { url: "https://storage.googleapis.com/kubernetes-release/release", label: "Default (Google)", @@ -309,8 +309,3 @@ export const DESCRIPTORS = { editorConfiguration, terminalCopyOnSelect, }; - -export const CONSTANTS = { - defaultPackageMirror, - packageMirrors, -}; diff --git a/src/main/kubectl.ts b/src/main/kubectl.ts index dbc302b929..846133d828 100644 --- a/src/main/kubectl.ts +++ b/src/main/kubectl.ts @@ -32,7 +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 { CONSTANTS } from "../common/user-store/preferences-helpers"; +import { defaultPackageMirror, packageMirrors } from "../common/user-store/preferences-helpers"; const bundledVersion = getBundledKubectlVersion(); const kubectlMap: Map = new Map([ @@ -388,7 +388,7 @@ export class Kubectl { protected getDownloadMirror() { // MacOS packages are only available from default - return CONSTANTS.packageMirrors.get(UserStore.getInstance().downloadMirror) - ?? CONSTANTS.packageMirrors.get(CONSTANTS.defaultPackageMirror); + return packageMirrors.get(UserStore.getInstance().downloadMirror) + ?? packageMirrors.get(defaultPackageMirror); } } diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx index 05a409acf2..85b699a840 100644 --- a/src/renderer/components/+preferences/kubectl-binaries.tsx +++ b/src/renderer/components/+preferences/kubectl-binaries.tsx @@ -27,7 +27,7 @@ import { observer } from "mobx-react"; import { bundledKubectlPath } from "../../../main/kubectl"; import { SelectOption, Select } from "../select"; import { FormSwitch, Switcher } from "../switch"; -import { CONSTANTS } from "../../../common/user-store/preferences-helpers"; +import { packageMirrors } from "../../../common/user-store/preferences-helpers"; export const KubectlBinaries = observer(() => { const userStore = UserStore.getInstance(); @@ -35,7 +35,7 @@ export const KubectlBinaries = observer(() => { const [binariesPath, setBinariesPath] = useState(userStore.kubectlBinariesPath || ""); const pathValidator = downloadPath ? InputValidators.isPath : undefined; const downloadMirrorOptions: SelectOption[] = Array.from( - CONSTANTS.packageMirrors.entries(), + packageMirrors.entries(), ([value, { label, platforms }]) => ({ value, label, platforms }) );