refactor kube api to common

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

package.json

@@ -196,6 +196,7 @@
     "chokidar": "^3.4.3",
     "command-exists": "1.2.9",
     "conf": "^7.0.1",
+    "cross-fetch": "^3.1.4",
     "crypto-js": "^4.0.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-updater": "^4.3.1",

src/common/item.store.ts

@@ -20,7 +20,7 @@
  */
 
 import orderBy from "lodash/orderBy";
-import { autoBind } from "./utils";
+import { autoBind } from "../renderer/utils";
 import { action, computed, observable, when, makeObservable } from "mobx";
 
 export interface ItemObject {

src/common/k8s-api/__tests__/api-manager.test.ts

@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { ingressStore } from "../../components/+network-ingresses/ingress.store";
+import { ingressStore } from "../../../renderer/components/+network-ingresses/ingress.store";
 import { apiManager } from "../api-manager";
 import { KubeApi } from "../kube-api";
 import { KubeObject } from "../kube-object";

src/common/k8s-api/api-manager.ts

@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import type { KubeObjectStore } from "../kube-object.store";
+import type { KubeObjectStore } from "./kube-object.store";
 
 import { action, observable, makeObservable } from "mobx";
 import { autoBind, iter } from "../utils";

src/common/k8s-api/cluster-context.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import type { Cluster } from "../../main/cluster";
+
+export interface ClusterContext {
+  cluster?: Cluster;
+  allNamespaces: string[]; // available / allowed namespaces from cluster.ts
+  contextNamespaces: string[]; // selected by user (see: namespace-select.tsx)
+}

src/common/k8s-api/endpoints/configmap.api.ts

@@ -22,7 +22,7 @@
 import { KubeObject } from "../kube-object";
 import type { KubeJsonApiData } from "../kube-json-api";
 import { KubeApi } from "../kube-api";
-import { autoBind } from "../../../common/utils";
+import { autoBind } from "../../utils";
 
 export interface ConfigMap {
   data: {

src/common/k8s-api/endpoints/crd.api.ts

@@ -21,7 +21,7 @@
 
 import { KubeObject } from "../kube-object";
 import { KubeApi } from "../kube-api";
-import { crdResourcesURL } from "../../../common/routes";
+import { crdResourcesURL } from "../../routes";
 
 type AdditionalPrinterColumnsCommon = {
   name: string;

src/common/k8s-api/endpoints/cron-job.api.ts

@@ -23,7 +23,7 @@ import moment from "moment";
 import { KubeObject } from "../kube-object";
 import type { IPodContainer } from "./pods.api";
 import { formatDuration } from "../../utils/formatDuration";
-import { autoBind } from "../../utils";
+import { autoBind } from "../../../renderer/utils";
 import { KubeApi } from "../kube-api";
 import type { KubeJsonApiData } from "../kube-json-api";
 

src/common/k8s-api/endpoints/helm-charts.api.ts

@@ -22,7 +22,7 @@
 import { compile } from "path-to-regexp";
 import { apiBase } from "../index";
 import { stringify } from "querystring";
-import { autoBind } from "../../utils";
+import { autoBind } from "../../../renderer/utils";
 
 export type RepoHelmChartList = Record<string, HelmChart[]>;
 export type HelmChartList = Record<string, RepoHelmChartList>;

src/common/k8s-api/endpoints/helm-releases.api.ts

@@ -23,11 +23,11 @@ import jsYaml from "js-yaml";
 import { autoBind, formatDuration } from "../../utils";
 import capitalize from "lodash/capitalize";
 import { apiBase } from "../index";
-import { helmChartStore } from "../../components/+apps-helm-charts/helm-chart.store";
+import { helmChartStore } from "../../../renderer/components/+apps-helm-charts/helm-chart.store";
 import type { ItemObject } from "../../item.store";
 import { KubeObject } from "../kube-object";
 import type { JsonApiData } from "../json-api";
-import { buildURLPositional } from "../../../common/utils/buildUrl";
+import { buildURLPositional } from "../../utils/buildUrl";
 import type { KubeJsonApiData } from "../kube-json-api";
 
 interface IReleasePayload {

src/common/k8s-api/endpoints/namespaces.api.ts

@@ -21,7 +21,7 @@
 
 import { KubeApi } from "../kube-api";
 import { KubeObject } from "../kube-object";
-import { autoBind } from "../../utils";
+import { autoBind } from "../../../renderer/utils";
 import { metricsApi } from "./metrics.api";
 import type { IPodMetrics } from "./pods.api";
 import type { KubeJsonApiData } from "../kube-json-api";

src/common/k8s-api/endpoints/nodes.api.ts

@@ -20,7 +20,7 @@
  */
 
 import { KubeObject } from "../kube-object";
-import { autoBind, cpuUnitsToNumber, unitsToBytes } from "../../utils";
+import { autoBind, cpuUnitsToNumber, unitsToBytes } from "../../../renderer/utils";
 import { IMetrics, metricsApi } from "./metrics.api";
 import { KubeApi } from "../kube-api";
 import type { KubeJsonApiData } from "../kube-json-api";

src/common/k8s-api/endpoints/persistent-volume.api.ts

@@ -20,7 +20,7 @@
  */
 
 import { KubeObject } from "../kube-object";
-import { unitsToBytes } from "../../utils/convertMemory";
+import { unitsToBytes } from "../../../renderer/utils/convertMemory";
 import { autoBind } from "../../utils";
 import { KubeApi } from "../kube-api";
 import type { KubeJsonApiData } from "../kube-json-api";

src/common/k8s-api/endpoints/replica-set.api.ts

@@ -20,7 +20,7 @@
  */
 
 import get from "lodash/get";
-import { autoBind } from "../../utils";
+import { autoBind } from "../../../renderer/utils";
 import { WorkloadKubeObject } from "../workload-kube-object";
 import { KubeApi } from "../kube-api";
 import { metricsApi } from "./metrics.api";

src/common/k8s-api/endpoints/service.api.ts

@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { autoBind } from "../../utils";
+import { autoBind } from "../../../renderer/utils";
 import { KubeObject } from "../kube-object";
 import { KubeApi } from "../kube-api";
 import type { KubeJsonApiData } from "../kube-json-api";

src/common/k8s-api/index.ts

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { JsonApi } from "./json-api";
+import { KubeJsonApi } from "./kube-json-api";
+import { apiKubePrefix, apiPrefix, isDebugging, isDevelopment } from "../../common/vars";
+
+export const apiBase = new JsonApi({
+  apiBase: apiPrefix,
+  debug: isDevelopment || isDebugging,
+});
+export const apiKube = new KubeJsonApi({
+  apiBase: apiKubePrefix,
+  debug: isDevelopment,
+});

src/common/k8s-api/json-api.ts

@@ -21,9 +21,12 @@
 
 // Base http-service / json-api class
 
+import fetch from "cross-fetch";
 import { stringify } from "querystring";
 import { EventEmitter } from "../../common/event-emitter";
 import { randomBytes } from "crypto";
+import { ipcRenderer } from "electron";
+import logger from "../../common/logger";
 
 export interface JsonApiData {
 }
@@ -78,8 +81,16 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
 
   getResponse(path: string, params?: P, init: RequestInit = {}): Promise<Response> {
     const reqPath = `${this.config.apiBase}${path}`;
-    const subdomain = randomBytes(2).toString("hex");
-    let reqUrl = `http://${subdomain}.${window.location.host}${reqPath}`; // hack around browser connection limits (chromium allows 6 per domain)
+    let reqUrl: string;
+
+    if (ipcRenderer) {
+      const subdomain = randomBytes(2).toString("hex");
+
+      reqUrl = `http://${subdomain}.${window.location.host}${reqPath}`; // hack around browser connection limits (chromium allows 6 per domain)
+    } else {
+      reqUrl = reqPath;
+    }
+
     const reqInit: RequestInit = { ...init };
     const { query } = params || {} as P;
 
@@ -194,11 +205,12 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
   protected writeLog(log: JsonApiLog) {
     if (!this.config.debug) return;
     const { method, reqUrl, ...params } = log;
-    let textStyle = "font-weight: bold;";
+    // let textStyle = "font-weight: bold;";
 
-    if (params.data) textStyle += "background: green; color: white;";
-    if (params.error) textStyle += "background: red; color: white;";
-    console.log(`%c${method} ${reqUrl}`, textStyle, params);
+    // if (params.data) textStyle += "background: green; color: white;";
+    // if (params.error) textStyle += "background: red; color: white;";
+    //console.log(`%c${method} ${reqUrl}`, textStyle, params);
+    logger.info(`[JSON-API] request ${method} ${reqUrl}`, params);
   }
 }
 

src/common/k8s-api/kube-api-parse.ts

@@ -21,8 +21,8 @@
 
 // Parse kube-api path and get api-version, group, etc.
 
-import { splitArray } from "../../common/utils";
-import { isDebugging } from "../../common/vars";
+import { splitArray } from "../utils";
+import { isDebugging } from "../vars";
 import logger from "../../main/logger";
 import { inspect } from "util";
 
@@ -66,7 +66,7 @@ export function parseKubeApi(path: string): IKubeApiParsed {
 }
 
 function _parseKubeApi(path: string): IKubeApiParsed {
-  const apiPath = new URL(path, location.origin).pathname;
+  const apiPath = new URL(path, "http://localhost").pathname;
   const [, prefix, ...parts] = apiPath.split("/");
   const apiPrefix = `/${prefix}`;
   const [left, right, namespaced] = splitArray(parts, "namespaces");

src/common/k8s-api/kube-api.ts

@@ -31,7 +31,7 @@ import { createKubeApiURL, parseKubeApi } from "./kube-api-parse";
 import { KubeObjectConstructor, KubeObject, KubeStatus } from "./kube-object";
 import byline from "byline";
 import type { IKubeWatchEvent } from "./kube-watch-api";
-import { ReadableWebToNodeStream } from "../utils/readableStream";
+import { ReadableWebToNodeStream } from "../../renderer/utils/readableStream";
 import { KubeJsonApi, KubeJsonApiData } from "./kube-json-api";
 import { noop } from "../utils";
 
@@ -168,7 +168,6 @@ export class KubeApi<T extends KubeObject> {
     this.request = request;
     this.objectConstructor = objectConstructor;
 
-    this.checkPreferredVersion();
     this.parseResponse = this.parseResponse.bind(this);
     apiManager.registerApi(apiBase, this);
   }
@@ -474,7 +473,7 @@ export class KubeApi<T extends KubeObject> {
         });
       })
       .catch(error => {
-        if (error instanceof DOMException) return; // AbortController rejects, we can ignore it
+        if (typeof DOMException === "function" && error instanceof DOMException) return; // AbortController rejects, we can ignore it
 
         callback(null, error);
       });

src/common/k8s-api/kube-json-api.ts

@@ -79,3 +79,4 @@ export class KubeJsonApi extends JsonApi<KubeJsonApiData> {
     return super.parseError(error, res);
   }
 }
+

src/common/k8s-api/kube-object.store.ts

@@ -19,18 +19,17 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import type { ClusterContext } from "./components/context";
+import type { ClusterContext } from "./cluster-context";
 
 import { action, computed, makeObservable, observable, reaction, when } from "mobx";
-import { autoBind, noop, rejectPromiseBy } from "./utils";
-import { KubeObject, KubeStatus } from "./api/kube-object";
-import type { IKubeWatchEvent } from "./api/kube-watch-api";
-import { ItemStore } from "./item.store";
-import { apiManager } from "./api/api-manager";
-import { ensureObjectSelfLink, IKubeApiQueryParams, KubeApi } from "./api/kube-api";
-import { parseKubeApi } from "./api/kube-api-parse";
-import type { KubeJsonApiData } from "./api/kube-json-api";
-import { Notifications } from "./components/notifications";
+import { autoBind, noop, rejectPromiseBy } from "../utils";
+import { KubeObject, KubeStatus } from "./kube-object";
+import type { IKubeWatchEvent } from "./kube-watch-api";
+import { ItemStore } from "../item.store";
+import { apiManager } from "./api-manager";
+import { ensureObjectSelfLink, IKubeApiQueryParams, KubeApi } from "./kube-api";
+import { parseKubeApi } from "./kube-api-parse";
+import type { KubeJsonApiData } from "./kube-json-api";
 
 export interface KubeObjectStoreLoadingParams<K extends KubeObject> {
   namespaces: string[];
@@ -193,9 +192,9 @@ export abstract class KubeObjectStore<T extends KubeObject> extends ItemStore<T>
 
       return items;
     } catch (error) {
-      if (error.message) {
-        Notifications.error(error.message);
-      }
+      // if (error.message) {
+      //   Notifications.error(error.message);
+      // }
       console.warn("[KubeObjectStore] loadAll failed", this.api.apiBase, error);
       this.resetOnError(error);
       this.failedLoading = true;

src/common/k8s-api/kube-watch-api.ts

@@ -22,15 +22,15 @@
 // Kubernetes watch-api client
 // API: https://developer.mozilla.org/en-US/docs/Web/API/Streams_API/Using_readable_streams
 
-import type { KubeObjectStore } from "../kube-object.store";
-import type { ClusterContext } from "../components/context";
+import type { KubeObjectStore } from "./kube-object.store";
+import type { ClusterContext } from "./cluster-context";
 
 import plimit from "p-limit";
 import { comparer, observable, reaction, makeObservable } from "mobx";
-import { autoBind, Disposer, noop } from "../utils";
+import { autoBind, Disposer, noop } from "../../renderer/utils";
 import type { KubeApi } from "./kube-api";
 import type { KubeJsonApiData } from "./kube-json-api";
-import { isDebugging, isProduction } from "../../common/vars";
+import { isDebugging, isProduction } from "../vars";
 import type { KubeObject } from "./kube-object";
 
 export interface IKubeWatchEvent<T extends KubeJsonApiData> {

src/common/logger.ts

@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { app, remote } from "electron";
+import winston from "winston";
+import { isDebugging, isTestEnv } from "./vars";
+
+const logLevel = process.env.LOG_LEVEL ? process.env.LOG_LEVEL : isDebugging ? "debug" : "info";
+const consoleOptions: winston.transports.ConsoleTransportOptions = {
+  handleExceptions: false,
+  level: logLevel,
+};
+const fileOptions: winston.transports.FileTransportOptions = {
+  handleExceptions: false,
+  level: logLevel,
+  filename: "lens.log",
+  dirname: (app ?? remote?.app)?.getPath("logs"),
+  maxsize: 16 * 1024,
+  maxFiles: 16,
+  tailable: true,
+};
+const logger = winston.createLogger({
+  format: winston.format.combine(
+    winston.format.colorize(),
+    winston.format.simple(),
+  ),
+  transports: [
+    new winston.transports.Console(consoleOptions),
+    ...(isTestEnv ? [] : [new winston.transports.File(fileOptions)]),
+  ],
+});
+
+export default logger;

src/common/utils/index.ts

@@ -37,6 +37,7 @@ export * from "./defineGlobal";
 export * from "./delay";
 export * from "./disposer";
 export * from "./downloadFile";
+export * from "./formatDuration";
 export * from "./escapeRegExp";
 export * from "./extended-map";
 export * from "./getRandId";

src/extensions/main-api/index.ts

@@ -21,12 +21,14 @@
 
 import * as Catalog from "./catalog";
 import * as Navigation from "./navigation";
+import * as K8sApi from "./k8s-api";
 import { IpcMain as Ipc } from "../ipc/ipc-main";
 import { LensMainExtension as LensExtension } from "../lens-main-extension";
 
 export {
   Catalog,
   Navigation,
+  K8sApi,
   Ipc,
   LensExtension,
 };

src/extensions/main-api/k8s-api.ts

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+export { isAllowedResource } from "../../common/utils/allowed-resource";
+export { ResourceStack } from "../../common/k8s/resource-stack";
+export { apiManager } from "../../common/k8s-api/api-manager";
+export { KubeApi, forCluster } from "../../common/k8s-api/kube-api";
+export { KubeObject } from "../../common/k8s-api/kube-object";
+export { Pod, podsApi, PodsApi } from "../../common/k8s-api/endpoints/pods.api";
+export { Node, nodesApi, NodesApi } from "../../common/k8s-api/endpoints/nodes.api";
+export { Deployment, deploymentApi, DeploymentApi } from "../../common/k8s-api/endpoints/deployment.api";
+export { DaemonSet, daemonSetApi } from "../../common/k8s-api/endpoints/daemon-set.api";
+export { StatefulSet, statefulSetApi } from "../../common/k8s-api/endpoints/stateful-set.api";
+export { Job, jobApi } from "../../common/k8s-api/endpoints/job.api";
+export { CronJob, cronJobApi } from "../../common/k8s-api/endpoints/cron-job.api";
+export { ConfigMap, configMapApi } from "../../common/k8s-api/endpoints/configmap.api";
+export { Secret, secretsApi } from "../../common/k8s-api/endpoints/secret.api";
+export { ReplicaSet, replicaSetApi } from "../../common/k8s-api/endpoints/replica-set.api";
+export { ResourceQuota, resourceQuotaApi } from "../../common/k8s-api/endpoints/resource-quota.api";
+export { LimitRange, limitRangeApi } from "../../common/k8s-api/endpoints/limit-range.api";
+export { HorizontalPodAutoscaler, hpaApi } from "../../common/k8s-api/endpoints/hpa.api";
+export { PodDisruptionBudget, pdbApi } from "../../common/k8s-api/endpoints/poddisruptionbudget.api";
+export { Service, serviceApi } from "../../common/k8s-api/endpoints/service.api";
+export { Endpoint, endpointApi } from "../../common/k8s-api/endpoints/endpoint.api";
+export { Ingress, ingressApi, IngressApi } from "../../common/k8s-api/endpoints/ingress.api";
+export { NetworkPolicy, networkPolicyApi } from "../../common/k8s-api/endpoints/network-policy.api";
+export { PersistentVolume, persistentVolumeApi } from "../../common/k8s-api/endpoints/persistent-volume.api";
+export { PersistentVolumeClaim, pvcApi, PersistentVolumeClaimsApi } from "../../common/k8s-api/endpoints/persistent-volume-claims.api";
+export { StorageClass, storageClassApi } from "../../common/k8s-api/endpoints/storage-class.api";
+export { Namespace, namespacesApi } from "../../common/k8s-api/endpoints/namespaces.api";
+export { KubeEvent, eventApi } from "../../common/k8s-api/endpoints/events.api";
+export { ServiceAccount, serviceAccountsApi } from "../../common/k8s-api/endpoints/service-accounts.api";
+export { Role, roleApi } from "../../common/k8s-api/endpoints/role.api";
+export { RoleBinding, roleBindingApi } from "../../common/k8s-api/endpoints/role-binding.api";
+export { ClusterRole, clusterRoleApi } from "../../common/k8s-api/endpoints/cluster-role.api";
+export { ClusterRoleBinding, clusterRoleBindingApi } from "../../common/k8s-api/endpoints/cluster-role-binding.api";
+export { CustomResourceDefinition, crdApi } from "../../common/k8s-api/endpoints/crd.api";
+
+// types
+export type { IKubeApiCluster } from "../../common/k8s-api/kube-api";
+export type { IPodContainer, IPodContainerStatus } from "../../common/k8s-api/endpoints/pods.api";
+export type { ISecretRef } from "../../common/k8s-api/endpoints/secret.api";

src/extensions/renderer-api/k8s-api.ts

@@ -21,45 +21,45 @@
 
 export { isAllowedResource } from "../../common/utils/allowed-resource";
 export { ResourceStack } from "../../common/k8s/resource-stack";
-export { apiManager } from "../../renderer/api/api-manager";
-export { KubeObjectStore } from "../../renderer/kube-object.store";
-export { KubeApi, forCluster } from "../../renderer/api/kube-api";
-export { KubeObject } from "../../renderer/api/kube-object";
-export { Pod, podsApi, PodsApi } from "../../renderer/api/endpoints";
-export { Node, nodesApi, NodesApi } from "../../renderer/api/endpoints";
-export { Deployment, deploymentApi, DeploymentApi } from "../../renderer/api/endpoints";
-export { DaemonSet, daemonSetApi } from "../../renderer/api/endpoints";
-export { StatefulSet, statefulSetApi } from "../../renderer/api/endpoints";
-export { Job, jobApi } from "../../renderer/api/endpoints";
-export { CronJob, cronJobApi } from "../../renderer/api/endpoints";
-export { ConfigMap, configMapApi } from "../../renderer/api/endpoints";
-export { Secret, secretsApi } from "../../renderer/api/endpoints";
-export { ReplicaSet, replicaSetApi } from "../../renderer/api/endpoints";
-export { ResourceQuota, resourceQuotaApi } from "../../renderer/api/endpoints";
-export { LimitRange, limitRangeApi } from "../../renderer/api/endpoints";
-export { HorizontalPodAutoscaler, hpaApi } from "../../renderer/api/endpoints";
-export { PodDisruptionBudget, pdbApi } from "../../renderer/api/endpoints";
-export { Service, serviceApi } from "../../renderer/api/endpoints";
-export { Endpoint, endpointApi } from "../../renderer/api/endpoints";
-export { Ingress, ingressApi, IngressApi } from "../../renderer/api/endpoints";
-export { NetworkPolicy, networkPolicyApi } from "../../renderer/api/endpoints";
-export { PersistentVolume, persistentVolumeApi } from "../../renderer/api/endpoints";
-export { PersistentVolumeClaim, pvcApi, PersistentVolumeClaimsApi } from "../../renderer/api/endpoints";
-export { StorageClass, storageClassApi } from "../../renderer/api/endpoints";
-export { Namespace, namespacesApi } from "../../renderer/api/endpoints";
-export { KubeEvent, eventApi } from "../../renderer/api/endpoints";
-export { ServiceAccount, serviceAccountsApi } from "../../renderer/api/endpoints";
-export { Role, roleApi } from "../../renderer/api/endpoints";
-export { RoleBinding, roleBindingApi } from "../../renderer/api/endpoints";
-export { ClusterRole, clusterRoleApi } from "../../renderer/api/endpoints";
-export { ClusterRoleBinding, clusterRoleBindingApi } from "../../renderer/api/endpoints";
-export { CustomResourceDefinition, crdApi } from "../../renderer/api/endpoints";
+export { apiManager } from "../../common/k8s-api/api-manager";
+export { KubeObjectStore } from "../../common/k8s-api/kube-object.store";
+export { KubeApi, forCluster } from "../../common/k8s-api/kube-api";
+export { KubeObject } from "../../common/k8s-api/kube-object";
+export { Pod, podsApi, PodsApi } from "../../common/k8s-api/endpoints";
+export { Node, nodesApi, NodesApi } from "../../common/k8s-api/endpoints";
+export { Deployment, deploymentApi, DeploymentApi } from "../../common/k8s-api/endpoints";
+export { DaemonSet, daemonSetApi } from "../../common/k8s-api/endpoints";
+export { StatefulSet, statefulSetApi } from "../../common/k8s-api/endpoints";
+export { Job, jobApi } from "../../common/k8s-api/endpoints";
+export { CronJob, cronJobApi } from "../../common/k8s-api/endpoints";
+export { ConfigMap, configMapApi } from "../../common/k8s-api/endpoints";
+export { Secret, secretsApi } from "../../common/k8s-api/endpoints";
+export { ReplicaSet, replicaSetApi } from "../../common/k8s-api/endpoints";
+export { ResourceQuota, resourceQuotaApi } from "../../common/k8s-api/endpoints";
+export { LimitRange, limitRangeApi } from "../../common/k8s-api/endpoints";
+export { HorizontalPodAutoscaler, hpaApi } from "../../common/k8s-api/endpoints";
+export { PodDisruptionBudget, pdbApi } from "../../common/k8s-api/endpoints";
+export { Service, serviceApi } from "../../common/k8s-api/endpoints";
+export { Endpoint, endpointApi } from "../../common/k8s-api/endpoints";
+export { Ingress, ingressApi, IngressApi } from "../../common/k8s-api/endpoints";
+export { NetworkPolicy, networkPolicyApi } from "../../common/k8s-api/endpoints";
+export { PersistentVolume, persistentVolumeApi } from "../../common/k8s-api/endpoints";
+export { PersistentVolumeClaim, pvcApi, PersistentVolumeClaimsApi } from "../../common/k8s-api/endpoints";
+export { StorageClass, storageClassApi } from "../../common/k8s-api/endpoints";
+export { Namespace, namespacesApi } from "../../common/k8s-api/endpoints";
+export { KubeEvent, eventApi } from "../../common/k8s-api/endpoints";
+export { ServiceAccount, serviceAccountsApi } from "../../common/k8s-api/endpoints";
+export { Role, roleApi } from "../../common/k8s-api/endpoints";
+export { RoleBinding, roleBindingApi } from "../../common/k8s-api/endpoints";
+export { ClusterRole, clusterRoleApi } from "../../common/k8s-api/endpoints";
+export { ClusterRoleBinding, clusterRoleBindingApi } from "../../common/k8s-api/endpoints";
+export { CustomResourceDefinition, crdApi } from "../../common/k8s-api/endpoints";
 export { KubeObjectStatusLevel } from "./kube-object-status";
 
 // types
-export type { IKubeApiCluster } from "../../renderer/api/kube-api";
-export type { IPodContainer, IPodContainerStatus } from "../../renderer/api/endpoints";
-export type { ISecretRef } from "../../renderer/api/endpoints";
+export type { IKubeApiCluster } from "../../common/k8s-api/kube-api";
+export type { IPodContainer, IPodContainerStatus } from "../../common/k8s-api/endpoints";
+export type { ISecretRef } from "../../common/k8s-api/endpoints";
 export type { KubeObjectStatus } from "./kube-object-status";
 
 // stores

src/main/helm/helm-chart-manager.ts

@@ -25,7 +25,7 @@ import { HelmRepo, HelmRepoManager } from "./helm-repo-manager";
 import logger from "../logger";
 import { promiseExec } from "../promise-exec";
 import { helmCli } from "./helm-cli";
-import type { RepoHelmChartList } from "../../renderer/api/endpoints/helm-charts.api";
+import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api";
 
 type CachedYaml = {
   entries: RepoHelmChartList

src/main/helm/helm-service.ts

@@ -24,7 +24,7 @@ import type { Cluster } from "../cluster";
 import logger from "../logger";
 import { HelmRepoManager } from "./helm-repo-manager";
 import { HelmChartManager } from "./helm-chart-manager";
-import type { HelmChart, HelmChartList, RepoHelmChartList } from "../../renderer/api/endpoints/helm-charts.api";
+import type { HelmChart, HelmChartList, RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api";
 import { deleteRelease, getHistory, getRelease, getValues, installChart, listReleases, rollback, upgradeRelease } from "./helm-release-manager";
 import { iter, sortCompareChartVersions } from "../../common/utils";
 

src/main/k8s-request.ts

@@ -21,7 +21,7 @@
 
 import request, { RequestPromiseOptions } from "request-promise-native";
 import { apiKubePrefix } from "../common/vars";
-import type { IMetricsReqParams } from "../renderer/api/endpoints/metrics.api";
+import type { IMetricsReqParams } from "../common/k8s-api/endpoints/metrics.api";
 import { LensProxy } from "./lens-proxy";
 import type { Cluster } from "./cluster";
 

src/main/logger.ts

@@ -19,95 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { app, remote } from "electron";
-import winston from "winston";
-import Transport from "winston-transport";
-import { isDebugging, isTestEnv } from "../common/vars";
-import { LEVEL } from "triple-beam";
-import { Severity } from "@sentry/browser";
-import * as Sentry from "@sentry/electron";
+import logger from "../common/logger";
 
-const SENTRY_LEVELS_MAP = {
-  silly: Severity.Debug,
-  verbose: Severity.Debug,
-  debug: Severity.Debug,
-  info: Severity.Info,
-  warn: Severity.Warning,
-  error: Severity.Error,
-};
-const WINSTON_CMP: Record<WinstonLevel, Set<WinstonLevel>> = {
-  silly: new Set(["silly", "verbose", "debug", "info", "warn", "error"]),
-  verbose: new Set(["verbose", "debug", "info", "warn", "error"]),
-  debug: new Set(["debug", "info", "warn", "error"]),
-  info: new Set(["info", "warn", "error"]),
-  warn: new Set(["warn", "error"]),
-  error: new Set(["error"]),
-};
-
-type WinstonLevel = keyof typeof SENTRY_LEVELS_MAP;
-
-class SentryTransport extends Transport {
-  logLevels: Set<WinstonLevel>;
-
-  constructor(minWinstonLevel: WinstonLevel) {
-    super();
-
-    this.logLevels = WINSTON_CMP[minWinstonLevel];
-  }
-
-  log(info: any, next: () => void) {
-    setImmediate(() => {
-      this.emit("logged", info);
-    });
-
-    const { message, level: _, tags, user, ...extra } = info;
-    const winstonLevel: WinstonLevel = info[LEVEL];
-    const level = SENTRY_LEVELS_MAP[winstonLevel];
-
-    try {
-      if (this.logLevels.has(winstonLevel)) {
-        Sentry.captureMessage(message, {
-          level,
-          tags,
-          extra,
-        });
-      }
-    } finally {
-      next();
-    }
-  }
-}
-
-interface CreateLoggerOpts extends winston.LoggerOptions {
-  transports?: Transport[];
-}
-
-const logLevel = process.env.LOG_LEVEL || (isDebugging ? "debug" : "info");
-
-const loggerOpts: CreateLoggerOpts = {
-  format: winston.format.combine(
-    winston.format.colorize(),
-    winston.format.simple(),
-  ),
-  transports: [
-    new SentryTransport("error"),
-    new winston.transports.Console({
-      handleExceptions: false,
-      level: logLevel,
-    }),
-  ],
-};
-
-if (!isTestEnv) {
-  loggerOpts.transports.push(new winston.transports.File({
-    handleExceptions: false,
-    level: logLevel,
-    filename: "lens.log",
-    dirname: (app ?? remote?.app)?.getPath("logs"),
-    maxsize: 16 * 1024,
-    maxFiles: 16,
-    tailable: true,
-  }));
-}
-
-export default winston.createLogger(loggerOpts);
+export default logger;

src/renderer/api/index.ts

@@ -19,19 +19,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { JsonApi, JsonApiErrorParsed } from "./json-api";
-import { KubeJsonApi } from "./kube-json-api";
+import type { JsonApiErrorParsed } from "../../common/k8s-api/json-api";
 import { Notifications } from "../components/notifications";
-import { apiKubePrefix, apiPrefix, isDebugging, isDevelopment } from "../../common/vars";
+import { apiBase, apiKube } from "../../common/k8s-api";
+export { apiBase, apiKube } from "../../common/k8s-api";
 
-export const apiBase = new JsonApi({
-  apiBase: apiPrefix,
-  debug: isDevelopment || isDebugging,
-});
-export const apiKube = new KubeJsonApi({
-  apiBase: apiKubePrefix,
-  debug: isDevelopment,
-});
 
 // Common handler for HTTP api errors
 export function onApiError(error: JsonApiErrorParsed, res: Response) {

src/renderer/components/+apps-helm-charts/helm-chart-details.tsx

@@ -22,7 +22,7 @@
 import "./helm-chart-details.scss";
 
 import React, { Component } from "react";
-import { getChartDetails, HelmChart } from "../../api/endpoints/helm-charts.api";
+import { getChartDetails, HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import { observable, autorun, makeObservable } from "mobx";
 import { observer } from "mobx-react";
 import { Drawer, DrawerItem } from "../drawer";

src/renderer/components/+apps-helm-charts/helm-chart.store.ts

@@ -22,8 +22,8 @@
 import semver from "semver";
 import { observable, makeObservable } from "mobx";
 import { autoBind, sortCompareChartVersions } from "../../utils";
-import { getChartDetails, HelmChart, listCharts } from "../../api/endpoints/helm-charts.api";
-import { ItemStore } from "../../item.store";
+import { getChartDetails, HelmChart, listCharts } from "../../../common/k8s-api/endpoints/helm-charts.api";
+import { ItemStore } from "../../../common/item.store";
 import flatten from "lodash/flatten";
 
 export interface IChartVersion {

src/renderer/components/+apps-helm-charts/helm-charts.tsx

@@ -25,7 +25,7 @@ import React, { Component } from "react";
 import type { RouteComponentProps } from "react-router";
 import { observer } from "mobx-react";
 import { helmChartStore } from "./helm-chart.store";
-import type { HelmChart } from "../../api/endpoints/helm-charts.api";
+import type { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import { HelmChartDetails } from "./helm-chart-details";
 import { navigation } from "../../navigation";
 import { ItemListLayout } from "../item-object-list/item-list-layout";

src/renderer/components/+apps-releases/release-details.tsx

@@ -27,7 +27,7 @@ import isEqual from "lodash/isEqual";
 import { observable, reaction, makeObservable } from "mobx";
 import { Link } from "react-router-dom";
 import kebabCase from "lodash/kebabCase";
-import { getRelease, getReleaseValues, HelmRelease, IReleaseDetails } from "../../api/endpoints/helm-releases.api";
+import { getRelease, getReleaseValues, HelmRelease, IReleaseDetails } from "../../../common/k8s-api/endpoints/helm-releases.api";
 import { HelmReleaseMenu } from "./release-menu";
 import { Drawer, DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
@@ -41,10 +41,10 @@ import { releaseStore } from "./release.store";
 import { Notifications } from "../notifications";
 import { createUpgradeChartTab } from "../dock/upgrade-chart.store";
 import { ThemeStore } from "../../theme.store";
-import { apiManager } from "../../api/api-manager";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 import { SubTitle } from "../layout/sub-title";
 import { secretsStore } from "../+config-secrets/secrets.store";
-import { Secret } from "../../api/endpoints";
+import { Secret } from "../../../common/k8s-api/endpoints";
 import { getDetailsUrl } from "../kube-detail-params";
 import { Checkbox } from "../checkbox";
 

src/renderer/components/+apps-releases/release-menu.tsx

@@ -20,7 +20,7 @@
  */
 
 import React from "react";
-import type { HelmRelease } from "../../api/endpoints/helm-releases.api";
+import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
 import { boundMethod, cssNames } from "../../utils";
 import { releaseStore } from "./release.store";
 import { MenuActions, MenuActionsProps } from "../menu/menu-actions";

src/renderer/components/+apps-releases/release-rollback-dialog.tsx

@@ -26,7 +26,7 @@ import { observable, makeObservable } from "mobx";
 import { observer } from "mobx-react";
 import { Dialog, DialogProps } from "../dialog";
 import { Wizard, WizardStep } from "../wizard";
-import { getReleaseHistory, HelmRelease, IReleaseRevision } from "../../api/endpoints/helm-releases.api";
+import { getReleaseHistory, HelmRelease, IReleaseRevision } from "../../../common/k8s-api/endpoints/helm-releases.api";
 import { releaseStore } from "./release.store";
 import { Select, SelectOption } from "../select";
 import { Notifications } from "../notifications";

src/renderer/components/+apps-releases/release.store.ts

@@ -22,9 +22,9 @@
 import isEqual from "lodash/isEqual";
 import { action, observable, reaction, when, makeObservable } from "mobx";
 import { autoBind } from "../../utils";
-import { createRelease, deleteRelease, HelmRelease, IReleaseCreatePayload, IReleaseUpdatePayload, listReleases, rollbackRelease, updateRelease } from "../../api/endpoints/helm-releases.api";
-import { ItemStore } from "../../item.store";
-import type { Secret } from "../../api/endpoints";
+import { createRelease, deleteRelease, HelmRelease, IReleaseCreatePayload, IReleaseUpdatePayload, listReleases, rollbackRelease, updateRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
+import { ItemStore } from "../../../common/item.store";
+import type { Secret } from "../../../common/k8s-api/endpoints";
 import { secretsStore } from "../+config-secrets/secrets.store";
 import { namespaceStore } from "../+namespaces/namespace.store";
 import { Notifications } from "../notifications";

src/renderer/components/+apps-releases/releases.tsx

@@ -26,7 +26,7 @@ import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
 import type { RouteComponentProps } from "react-router";
 import { releaseStore } from "./release.store";
-import type { HelmRelease } from "../../api/endpoints/helm-releases.api";
+import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
 import { ReleaseDetails } from "./release-details";
 import { ReleaseRollbackDialog } from "./release-rollback-dialog";
 import { navigation } from "../../navigation";

src/renderer/components/+catalog/catalog-entity.store.tsx

@@ -25,14 +25,14 @@ import React from "react";
 import { action, computed, IReactionDisposer, makeObservable, observable, reaction } from "mobx";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
 import type { CatalogEntity, CatalogEntityActionContext } from "../../api/catalog-entity";
-import { ItemObject, ItemStore } from "../../item.store";
+import { ItemObject, ItemStore } from "../../../common/item.store";
 import { CatalogCategory, catalogCategoryRegistry } from "../../../common/catalog";
 import { autoBind } from "../../../common/utils";
 import { Badge } from "../badge";
 import { navigation } from "../../navigation";
 import { searchUrlParam } from "../input";
 import { makeCss } from "../../../common/utils/makeCss";
-import { KubeObject } from "../../api/kube-object";
+import { KubeObject } from "../../../common/k8s-api/kube-object";
 
 const css = makeCss(styles);
 

src/renderer/components/+cluster/cluster-issues.tsx

@@ -30,12 +30,12 @@ import { Table, TableCell, TableHead, TableRow } from "../table";
 import { nodesStore } from "../+nodes/nodes.store";
 import { eventStore } from "../+events/event.store";
 import { boundMethod, cssNames, prevDefault } from "../../utils";
-import type { ItemObject } from "../../item.store";
+import type { ItemObject } from "../../../common/item.store";
 import { Spinner } from "../spinner";
 import { ThemeStore } from "../../theme.store";
-import { apiManager } from "../../api/api-manager";
 import { kubeSelectedUrlParam, showDetails } from "../kube-detail-params";
-import { kubeWatchApi } from "../../api/kube-watch-api";
+import { kubeWatchApi } from "../../../common/k8s-api/kube-watch-api";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 interface Props {
   className?: string;

src/renderer/components/+cluster/cluster-metrics.tsx

@@ -31,7 +31,7 @@ import { Spinner } from "../spinner";
 import { ZebraStripes } from "../chart/zebra-stripes.plugin";
 import { ClusterNoMetrics } from "./cluster-no-metrics";
 import { ClusterMetricSwitchers } from "./cluster-metric-switchers";
-import { getMetricLastPoints } from "../../api/endpoints/metrics.api";
+import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api";
 
 export const ClusterMetrics = observer(() => {
   const { metricType, metricNodeRole, getMetricsValues, metricsLoaded, metrics } = clusterOverviewStore;

src/renderer/components/+cluster/cluster-overview.store.ts

@@ -20,12 +20,12 @@
  */
 
 import { action, observable, reaction, when, makeObservable } from "mobx";
-import { KubeObjectStore } from "../../kube-object.store";
-import { Cluster, clusterApi, getMetricsByNodeNames, IClusterMetrics } from "../../api/endpoints";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { Cluster, clusterApi, getMetricsByNodeNames, IClusterMetrics } from "../../../common/k8s-api/endpoints";
 import { autoBind, createStorage } from "../../utils";
-import { IMetricsReqParams, normalizeMetrics } from "../../api/endpoints/metrics.api";
+import { IMetricsReqParams, normalizeMetrics } from "../../../common/k8s-api/endpoints/metrics.api";
 import { nodesStore } from "../+nodes/nodes.store";
-import { apiManager } from "../../api/api-manager";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 export enum MetricType {
   MEMORY = "memory",

src/renderer/components/+cluster/cluster-pie-charts.tsx

@@ -31,7 +31,7 @@ import { ChartData, PieChart } from "../chart";
 import { ClusterNoMetrics } from "./cluster-no-metrics";
 import { bytesToUnits } from "../../utils";
 import { ThemeStore } from "../../theme.store";
-import { getMetricLastPoints } from "../../api/endpoints/metrics.api";
+import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api";
 
 function createLabels(rawLabelData: [string, number | undefined][]): string[] {
   return rawLabelData.map(([key, value]) => `${key}: ${value?.toFixed(2) || "N/A"}`);

src/renderer/components/+config-autoscalers/hpa-details.tsx

@@ -28,9 +28,9 @@ import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { cssNames } from "../../utils";
-import { HorizontalPodAutoscaler, HpaMetricType, IHpaMetric } from "../../api/endpoints/hpa.api";
+import { HorizontalPodAutoscaler, HpaMetricType, IHpaMetric } from "../../../common/k8s-api/endpoints/hpa.api";
 import { Table, TableCell, TableHead, TableRow } from "../table";
-import { apiManager } from "../../api/api-manager";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { getDetailsUrl } from "../kube-detail-params";
 

src/renderer/components/+config-autoscalers/hpa.store.ts

@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectStore } from "../../kube-object.store";
-import { HorizontalPodAutoscaler, hpaApi } from "../../api/endpoints/hpa.api";
-import { apiManager } from "../../api/api-manager";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { HorizontalPodAutoscaler, hpaApi } from "../../../common/k8s-api/endpoints/hpa.api";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 export class HPAStore extends KubeObjectStore<HorizontalPodAutoscaler> {
   api = hpaApi;

src/renderer/components/+config-autoscalers/hpa.tsx

@@ -25,7 +25,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import type { RouteComponentProps } from "react-router";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
-import type { HorizontalPodAutoscaler } from "../../api/endpoints/hpa.api";
+import type { HorizontalPodAutoscaler } from "../../../common/k8s-api/endpoints/hpa.api";
 import { hpaStore } from "./hpa.store";
 import { Badge } from "../badge";
 import { cssNames } from "../../utils";

src/renderer/components/+config-limit-ranges/limit-range-details.tsx

@@ -24,7 +24,7 @@ import "./limit-range-details.scss";
 import React from "react";
 import { observer } from "mobx-react";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { LimitPart, LimitRange, LimitRangeItem, Resource } from "../../api/endpoints/limit-range.api";
+import { LimitPart, LimitRange, LimitRangeItem, Resource } from "../../../common/k8s-api/endpoints/limit-range.api";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { DrawerItem } from "../drawer/drawer-item";
 import { Badge } from "../badge";

src/renderer/components/+config-limit-ranges/limit-ranges.store.ts

@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectStore } from "../../kube-object.store";
-import { apiManager } from "../../api/api-manager";
-import { LimitRange, limitRangeApi } from "../../api/endpoints/limit-range.api";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { apiManager } from "../../../common/k8s-api/api-manager";
+import { LimitRange, limitRangeApi } from "../../../common/k8s-api/endpoints/limit-range.api";
 
 export class LimitRangesStore extends KubeObjectStore<LimitRange> {
   api = limitRangeApi;

src/renderer/components/+config-maps/config-map-details.tsx

@@ -30,7 +30,7 @@ import { Input } from "../input";
 import { Button } from "../button";
 import { configMapsStore } from "./config-maps.store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { ConfigMap } from "../../api/endpoints";
+import type { ConfigMap } from "../../../common/k8s-api/endpoints";
 import { KubeObjectMeta } from "../kube-object-meta";
 
 interface Props extends KubeObjectDetailsProps<ConfigMap> {

src/renderer/components/+config-maps/config-maps.store.ts

@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectStore } from "../../kube-object.store";
-import { ConfigMap, configMapApi } from "../../api/endpoints/configmap.api";
-import { apiManager } from "../../api/api-manager";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { ConfigMap, configMapApi } from "../../../common/k8s-api/endpoints/configmap.api";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 export class ConfigMapsStore extends KubeObjectStore<ConfigMap> {
   api = configMapApi;

src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets-details.tsx

@@ -26,7 +26,7 @@ import { observer } from "mobx-react";
 import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { PodDisruptionBudget } from "../../api/endpoints";
+import type { PodDisruptionBudget } from "../../../common/k8s-api/endpoints";
 import { KubeObjectMeta } from "../kube-object-meta";
 
 interface Props extends KubeObjectDetailsProps<PodDisruptionBudget> {

src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store.ts

@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectStore } from "../../kube-object.store";
-import { pdbApi, PodDisruptionBudget } from "../../api/endpoints/poddisruptionbudget.api";
-import { apiManager } from "../../api/api-manager";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { pdbApi, PodDisruptionBudget } from "../../../common/k8s-api/endpoints/poddisruptionbudget.api";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 export class PodDisruptionBudgetsStore extends KubeObjectStore<PodDisruptionBudget> {
   api = pdbApi;

src/renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.tsx

@@ -24,7 +24,7 @@ import "./pod-disruption-budgets.scss";
 import * as React from "react";
 import { observer } from "mobx-react";
 import { podDisruptionBudgetsStore } from "./pod-disruption-budgets.store";
-import type { PodDisruptionBudget } from "../../api/endpoints/poddisruptionbudget.api";
+import type { PodDisruptionBudget } from "../../../common/k8s-api/endpoints/poddisruptionbudget.api";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeObjectListLayout } from "../kube-object-list-layout";

src/renderer/components/+config-resource-quotas/add-quota-dialog.tsx

@@ -28,7 +28,7 @@ import { Dialog, DialogProps } from "../dialog";
 import { Wizard, WizardStep } from "../wizard";
 import { Input } from "../input";
 import { systemName } from "../input/input_validators";
-import { IResourceQuotaValues, resourceQuotaApi } from "../../api/endpoints/resource-quota.api";
+import { IResourceQuotaValues, resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api";
 import { Select } from "../select";
 import { Icon } from "../icon";
 import { Button } from "../button";

src/renderer/components/+config-resource-quotas/resource-quota-details.tsx

@@ -26,7 +26,7 @@ import { observer } from "mobx-react";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { cpuUnitsToNumber, cssNames, unitsToBytes, metricUnitsToNumber } from "../../utils";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { ResourceQuota } from "../../api/endpoints/resource-quota.api";
+import type { ResourceQuota } from "../../../common/k8s-api/endpoints/resource-quota.api";
 import { LineProgress } from "../line-progress";
 import { Table, TableCell, TableHead, TableRow } from "../table";
 import { KubeObjectMeta } from "../kube-object-meta";

src/renderer/components/+config-resource-quotas/resource-quotas.store.ts

@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { KubeObjectStore } from "../../kube-object.store";
-import { ResourceQuota, resourceQuotaApi } from "../../api/endpoints/resource-quota.api";
-import { apiManager } from "../../api/api-manager";
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import { ResourceQuota, resourceQuotaApi } from "../../../common/k8s-api/endpoints/resource-quota.api";
+import { apiManager } from "../../../common/k8s-api/api-manager";
 
 export class ResourceQuotasStore extends KubeObjectStore<ResourceQuota> {
   api = resourceQuotaApi;

src/renderer/components/+config-secrets/add-secret-dialog.tsx

@@ -28,12 +28,12 @@ import { Dialog, DialogProps } from "../dialog";
 import { Wizard, WizardStep } from "../wizard";
 import { Input } from "../input";
 import { systemName } from "../input/input_validators";
-import { Secret, secretsApi, SecretType } from "../../api/endpoints";
+import { Secret, secretsApi, SecretType } from "../../../common/k8s-api/endpoints";
 import { SubTitle } from "../layout/sub-title";
 import { NamespaceSelect } from "../+namespaces/namespace-select";
 import { Select, SelectOption } from "../select";
 import { Icon } from "../icon";
-import type { KubeObjectMetadata } from "../../api/kube-object";
+import type { KubeObjectMetadata } from "../../../common/k8s-api/kube-object";
 import { base64 } from "../../utils";
 import { Notifications } from "../notifications";
 import upperFirst from "lodash/upperFirst";

src/renderer/components/+config-secrets/secret-details.tsx

@@ -33,7 +33,7 @@ import { base64 } from "../../utils";
 import { Icon } from "../icon";
 import { secretsStore } from "./secrets.store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { Secret } from "../../api/endpoints";
+import type { Secret } from "../../../common/k8s-api/endpoints";
 import { KubeObjectMeta } from "../kube-object-meta";
 
 interface Props extends KubeObjectDetailsProps<Secret> {