Merge pull request #3875 from skoeva/k8s-imports

illume · web-flow · commit 9f64e609338f · 2025-09-03T19:24:33.000+02:00
frontend: Fix circular k8s API imports
diff --git a/frontend/src/components/App/Home/ClusterContextMenu.tsx b/frontend/src/components/App/Home/ClusterContextMenu.tsx
@@ -26,7 +26,7 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import helpers from '../../../helpers';
-import { deleteCluster } from '../../../lib/k8s/apiProxy';
+import { deleteCluster } from '../../../lib/k8s/api/v1/clusterApi';
 import { Cluster } from '../../../lib/k8s/cluster';
 import { createRouteURL } from '../../../lib/router';
 import { useId } from '../../../lib/util';
diff --git a/frontend/src/components/App/Home/ClusterTable.tsx b/frontend/src/components/App/Home/ClusterTable.tsx
@@ -24,7 +24,7 @@ import { useTranslation } from 'react-i18next';
 import { generatePath, useHistory } from 'react-router-dom';
 import { formatClusterPathParam } from '../../../lib/cluster';
 import { useClustersConf, useClustersVersion } from '../../../lib/k8s';
-import { ApiError } from '../../../lib/k8s/apiProxy';
+import { ApiError } from '../../../lib/k8s/api/v2/ApiError';
 import { Cluster } from '../../../lib/k8s/cluster';
 import { getClusterPrefixedPath } from '../../../lib/util';
 import { useTypedSelector } from '../../../redux/hooks';
diff --git a/frontend/src/components/App/Layout.tsx b/frontend/src/components/App/Layout.tsx
@@ -28,7 +28,7 @@ import { useDispatch } from 'react-redux';
 import { getCluster } from '../../lib/cluster';
 import { getSelectedClusters } from '../../lib/cluster';
 import { useClustersConf } from '../../lib/k8s';
-import { request } from '../../lib/k8s/apiProxy';
+import { request } from '../../lib/k8s/api/v1/clusterRequests';
 import { Cluster } from '../../lib/k8s/cluster';
 import { setConfig } from '../../redux/configSlice';
 import { ConfigState } from '../../redux/configSlice';
diff --git a/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx b/frontend/src/components/App/PluginSettings/PluginSettingsDetails.tsx
@@ -25,7 +25,7 @@ import { useParams } from 'react-router-dom';
 import { useHistory } from 'react-router-dom';
 import { isElectron } from '../../../helpers/isElectron';
 import { getCluster } from '../../../lib/cluster';
-import { deletePlugin } from '../../../lib/k8s/apiProxy';
+import { deletePlugin } from '../../../lib/k8s/api/v1/pluginsApi';
 import { ConfigStore } from '../../../plugin/configStore';
 import { PluginInfo, reloadPage } from '../../../plugin/pluginsSlice';
 import { useTypedSelector } from '../../../redux/hooks';
diff --git a/frontend/src/components/App/RouteSwitcher.tsx b/frontend/src/components/App/RouteSwitcher.tsx
@@ -21,7 +21,7 @@ import { useDispatch } from 'react-redux';
 import { Redirect, Route, RouteProps, Switch, useHistory } from 'react-router-dom';
 import { getCluster, getSelectedClusters } from '../../lib/cluster';
 import { useCluster, useClustersConf } from '../../lib/k8s';
-import { testAuth } from '../../lib/k8s/apiProxy';
+import { testAuth } from '../../lib/k8s/api/v1/clusterApi';
 import {
   createRouteURL,
   getDefaultRoutes,
diff --git a/frontend/src/components/App/Settings/SettingsCluster.tsx b/frontend/src/components/App/Settings/SettingsCluster.tsx
@@ -32,7 +32,7 @@ import {
 } from '../../../helpers/clusterSettings';
 import { isElectron } from '../../../helpers/isElectron';
 import { useCluster, useClustersConf } from '../../../lib/k8s';
-import { deleteCluster, parseKubeConfig, renameCluster } from '../../../lib/k8s/apiProxy';
+import { deleteCluster, parseKubeConfig, renameCluster } from '../../../lib/k8s/api/v1/clusterApi';
 import { setConfig, setStatelessConfig } from '../../../redux/configSlice';
 import { updateStatelessClusterKubeconfig } from '../../../stateless';
 import { findKubeconfigByClusterName } from '../../../stateless/findKubeconfigByClusterName';
diff --git a/frontend/src/components/account/Auth.tsx b/frontend/src/components/account/Auth.tsx
@@ -29,7 +29,8 @@ import { generatePath, useHistory } from 'react-router-dom';
 import { setToken } from '../../lib/auth';
 import { getCluster, getClusterPrefixedPath } from '../../lib/cluster';
 import { useClustersConf } from '../../lib/k8s';
-import { ApiError, testAuth } from '../../lib/k8s/apiProxy';
+import { testAuth } from '../../lib/k8s/api/v1/clusterApi';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import { ClusterDialog } from '../cluster/Chooser';
 import { DialogTitle } from '../common/Dialog';
 import HeadlampLink from '../common/Link';
diff --git a/frontend/src/components/advancedSearch/utils/useKubeLists.tsx b/frontend/src/components/advancedSearch/utils/useKubeLists.tsx
@@ -16,8 +16,8 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { ResourceClasses } from '../../../lib/k8s';
+import { ApiError } from '../../../lib/k8s/api/v2/ApiError';
 import { ApiResource } from '../../../lib/k8s/api/v2/ApiResource';
-import { ApiError } from '../../../lib/k8s/apiProxy';
 import { KubeObject, KubeObjectClass } from '../../../lib/k8s/cluster';
 import { useNamespaces } from '../../../redux/filterSlice';
 
diff --git a/frontend/src/components/authchooser/index.tsx b/frontend/src/components/authchooser/index.tsx
@@ -25,7 +25,7 @@ import { generatePath, useHistory, useLocation } from 'react-router-dom';
 import { getAppUrl } from '../../helpers/getAppUrl';
 import { getCluster, getClusterPrefixedPath } from '../../lib/cluster';
 import { useClustersConf } from '../../lib/k8s';
-import { testAuth } from '../../lib/k8s/apiProxy';
+import { testAuth } from '../../lib/k8s/api/v1/clusterApi';
 import { createRouteURL, getRoute, getRoutePath } from '../../lib/router';
 import { setConfig } from '../../redux/configSlice';
 import { ClusterDialog } from '../cluster/Chooser';
diff --git a/frontend/src/components/cluster/KubeConfigLoader.tsx b/frontend/src/components/cluster/KubeConfigLoader.tsx
@@ -31,7 +31,7 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { useClustersConf } from '../../lib/k8s';
-import { setCluster } from '../../lib/k8s/apiProxy';
+import { setCluster } from '../../lib/k8s/api/v1/clusterApi';
 import { setStatelessConfig } from '../../redux/configSlice';
 import { DialogTitle } from '../common/Dialog';
 import Loader from '../common/Loader';
diff --git a/frontend/src/components/common/AlertNotification.tsx b/frontend/src/components/common/AlertNotification.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { matchPath, useLocation } from 'react-router-dom';
 import { getCluster } from '../../lib/cluster';
-import { testClusterHealth } from '../../lib/k8s/apiProxy';
+import { testClusterHealth } from '../../lib/k8s/api/v1/clusterApi';
 import { getRoute, getRoutePath } from '../../lib/router';
 
 // in ms
diff --git a/frontend/src/components/common/Resource/EditorDialog.tsx b/frontend/src/components/common/Resource/EditorDialog.tsx
@@ -31,7 +31,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { getCluster } from '../../../lib/cluster';
-import { apply } from '../../../lib/k8s/apiProxy';
+import { apply } from '../../../lib/k8s/api/v1/apply';
 import { KubeObjectInterface } from '../../../lib/k8s/KubeObject';
 import { useId } from '../../../lib/util';
 import { clusterAction } from '../../../redux/clusterActionSlice';
diff --git a/frontend/src/components/common/Resource/PortForward.tsx b/frontend/src/components/common/Resource/PortForward.tsx
@@ -28,12 +28,12 @@ import { useTranslation } from 'react-i18next';
 import { isDockerDesktop } from '../../../helpers/isDockerDesktop';
 import { isElectron } from '../../../helpers/isElectron';
 import { getCluster } from '../../../lib/cluster';
-import { PortForward as PortForwardState } from '../../../lib/k8s/api/v1/portForward';
 import {
   listPortForward,
+  PortForward as PortForwardState,
   startPortForward,
   stopOrDeletePortForward,
-} from '../../../lib/k8s/apiProxy';
+} from '../../../lib/k8s/api/v1/portForward';
 import { KubeContainer } from '../../../lib/k8s/cluster';
 import { KubeObject, KubeObjectInterface } from '../../../lib/k8s/KubeObject';
 import Pod from '../../../lib/k8s/pod';
diff --git a/frontend/src/components/common/Resource/Resource.tsx b/frontend/src/components/common/Resource/Resource.tsx
@@ -34,7 +34,7 @@ import { useTranslation } from 'react-i18next';
 import { generatePath, NavLinkProps, useLocation } from 'react-router-dom';
 import YAML from 'yaml';
 import { labelSelectorToQuery, ResourceClasses, useCluster } from '../../../lib/k8s';
-import { ApiError } from '../../../lib/k8s/apiProxy';
+import { ApiError } from '../../../lib/k8s/api/v2/ApiError';
 import { KubeCondition, KubeContainer, KubeContainerStatus } from '../../../lib/k8s/cluster';
 import { KubeEvent } from '../../../lib/k8s/event';
 import { KubeObject } from '../../../lib/k8s/KubeObject';
diff --git a/frontend/src/components/common/Resource/ResourceTable.tsx b/frontend/src/components/common/Resource/ResourceTable.tsx
@@ -22,7 +22,7 @@ import { MRT_FilterFns, MRT_Row, MRT_SortingFn, MRT_TableInstance } from 'materi
 import { ComponentProps, ReactNode, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelectedClusters } from '../../../lib/k8s';
-import { ApiError } from '../../../lib/k8s/apiProxy';
+import { ApiError } from '../../../lib/k8s/api/v2/ApiError';
 import { KubeObject } from '../../../lib/k8s/KubeObject';
 import { KubeObjectClass } from '../../../lib/k8s/KubeObject';
 import { useFilterFunc } from '../../../lib/util';
diff --git a/frontend/src/components/cronjob/Details.tsx b/frontend/src/components/cronjob/Details.tsx
@@ -28,7 +28,7 @@ import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { apply } from '../../lib/k8s/apiProxy';
+import { apply } from '../../lib/k8s/api/v1/apply';
 import CronJob from '../../lib/k8s/cronJob';
 import Job from '../../lib/k8s/job';
 import { clusterAction } from '../../redux/clusterActionSlice';
diff --git a/frontend/src/components/limitRange/List.tsx b/frontend/src/components/limitRange/List.tsx
@@ -15,7 +15,7 @@
  */
 
 import { useTranslation } from 'react-i18next';
-import { ApiError } from '../../lib/k8s/apiProxy';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import { LimitRange } from '../../lib/k8s/limitRange';
 import { useNamespaces } from '../../redux/filterSlice';
 import { CreateResourceButton } from '../common/CreateResourceButton';
diff --git a/frontend/src/components/node/Details.tsx b/frontend/src/components/node/Details.tsx
@@ -24,7 +24,8 @@ import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { apply, drainNode, drainNodeStatus } from '../../lib/k8s/apiProxy';
+import { apply } from '../../lib/k8s/api/v1/apply';
+import { drainNode, drainNodeStatus } from '../../lib/k8s/api/v1/drainNode';
 import { KubeMetrics } from '../../lib/k8s/cluster';
 import Node from '../../lib/k8s/node';
 import { getCluster, timeAgo } from '../../lib/util';
diff --git a/frontend/src/components/node/NodeShellTerminal.tsx b/frontend/src/components/node/NodeShellTerminal.tsx
@@ -26,7 +26,8 @@ import {
   loadClusterSettings,
 } from '../../helpers/clusterSettings';
 import { getCluster } from '../../lib/cluster';
-import { apply, stream, StreamResultsCb } from '../../lib/k8s/apiProxy';
+import { apply } from '../../lib/k8s/api/v1/apply';
+import { stream, StreamResultsCb } from '../../lib/k8s/api/v1/streamingApi';
 import Node from '../../lib/k8s/node';
 import Pod, { KubePod } from '../../lib/k8s/pod';
 
diff --git a/frontend/src/components/pod/List.tsx b/frontend/src/components/pod/List.tsx
@@ -18,7 +18,7 @@ import { Icon } from '@iconify/react';
 import Box from '@mui/material/Box';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ApiError } from '../../lib/k8s/apiProxy';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import { KubeContainerStatus } from '../../lib/k8s/cluster';
 import Pod from '../../lib/k8s/pod';
 import { METRIC_REFETCH_INTERVAL_MS, PodMetrics } from '../../lib/k8s/PodMetrics';
diff --git a/frontend/src/components/pod/PodLogs.stories.tsx b/frontend/src/components/pod/PodLogs.stories.tsx
@@ -16,7 +16,7 @@
 
 import { Meta, StoryFn } from '@storybook/react';
 import { getTestDate } from '../../helpers/testHelpers';
-import { StreamResultsCb } from '../../lib/k8s/apiProxy';
+import { StreamResultsCb } from '../../lib/k8s/api/v1/streamingApi';
 import { LogOptions } from '../../lib/k8s/pod';
 import { TestContext } from '../../test';
 import { PodLogViewer } from './Details';
diff --git a/frontend/src/components/portforward/index.tsx b/frontend/src/components/portforward/index.tsx
@@ -25,7 +25,11 @@ import { useSnackbar } from 'notistack';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { isDockerDesktop } from '../../helpers/isDockerDesktop';
-import { listPortForward, startPortForward, stopOrDeletePortForward } from '../../lib/k8s/apiProxy';
+import {
+  listPortForward,
+  startPortForward,
+  stopOrDeletePortForward,
+} from '../../lib/k8s/api/v1/portForward';
 import { getCluster } from '../../lib/util';
 import { StatusLabel } from '../common/Label';
 import Link from '../common/Link';
diff --git a/frontend/src/components/project/NewProjectPopup.tsx b/frontend/src/components/project/NewProjectPopup.tsx
@@ -33,7 +33,8 @@ import { ReactNode, useCallback, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router';
 import { useClustersConf } from '../../lib/k8s';
-import { ApiError, apply } from '../../lib/k8s/apiProxy';
+import { apply } from '../../lib/k8s/api/v1/apply';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import { KubeObjectInterface } from '../../lib/k8s/KubeObject';
 import Namespace from '../../lib/k8s/namespace';
 import { createRouteURL } from '../../lib/router';
diff --git a/frontend/src/components/project/ProjectCreateFromYaml.tsx b/frontend/src/components/project/ProjectCreateFromYaml.tsx
@@ -37,7 +37,8 @@ import { useDropzone } from 'react-dropzone';
 import { Trans, useTranslation } from 'react-i18next';
 import { Redirect, useHistory } from 'react-router';
 import { useClustersConf } from '../../lib/k8s';
-import { ApiError, apply } from '../../lib/k8s/apiProxy';
+import { apply } from '../../lib/k8s/api/v1/apply';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import { KubeObjectInterface } from '../../lib/k8s/KubeObject';
 import { createRouteURL } from '../../lib/router';
 import { ViewYaml } from '../advancedSearch/ResourceSearch';
diff --git a/frontend/src/components/resourceQuota/List.tsx b/frontend/src/components/resourceQuota/List.tsx
@@ -19,7 +19,7 @@ import Chip from '@mui/material/Chip';
 import { styled } from '@mui/system';
 import { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ApiError } from '../../lib/k8s/apiProxy';
+import { ApiError } from '../../lib/k8s/api/v2/ApiError';
 import ResourceQuota from '../../lib/k8s/resourceQuota';
 import { useNamespaces } from '../../redux/filterSlice';
 import { CreateResourceButton } from '../common/CreateResourceButton';
diff --git a/frontend/src/lib/docs.test.ts b/frontend/src/lib/docs.test.ts
@@ -16,9 +16,9 @@
 
 import Swagger from '@apidevtools/swagger-parser';
 import { beforeEach, describe, expect, it, Mock, vi } from 'vitest';
-import { request } from './k8s/apiProxy';
+import { request } from './k8s/api/v1/clusterRequests';
 
-vi.mock('./k8s/apiProxy', () => ({
+vi.mock('./k8s/api/v1/clusterRequests', () => ({
   request: vi.fn(),
 }));
 
diff --git a/frontend/src/lib/docs.ts b/frontend/src/lib/docs.ts
@@ -20,7 +20,7 @@
 
 import Swagger from '@apidevtools/swagger-parser';
 import { OpenAPIV2 } from 'openapi-types';
-import { request } from './k8s/apiProxy';
+import { request } from './k8s/api/v1/clusterRequests';
 
 let docsPromise: ReturnType<typeof getDocs> | null = null;
 
diff --git a/frontend/src/lib/k8s/KubeObject.ts b/frontend/src/lib/k8s/KubeObject.ts
@@ -22,17 +22,14 @@ import { formatClusterPathParam, getCluster, getSelectedClusters } from '../clus
 import { createRouteURL } from '../router';
 import { timeAgo } from '../util';
 import { useConnectApi, useSelectedClusters } from '.';
+import { post } from './api/v1/clusterRequests';
+import { DeleteParameters } from './api/v1/deleteParameters';
 import { RecursivePartial } from './api/v1/factories';
+import { apiFactory, apiFactoryWithNamespace } from './api/v1/factories';
+import { QueryParameters } from './api/v1/queryParameters';
+import { ApiError } from './api/v2/ApiError';
 import { useKubeObject } from './api/v2/hooks';
 import { makeListRequests, useKubeObjectList } from './api/v2/useKubeObjectList';
-import {
-  ApiError,
-  apiFactory,
-  apiFactoryWithNamespace,
-  DeleteParameters,
-  post,
-  QueryParameters,
-} from './apiProxy';
 import { KubeEvent } from './event';
 import { KubeMetadata } from './KubeMetadata';
 
diff --git a/frontend/src/lib/k8s/api/v2/hooks.ts b/frontend/src/lib/k8s/api/v2/hooks.ts
@@ -17,7 +17,8 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { useMemo } from 'react';
 import { getCluster } from '../../../cluster';
-import { ApiError, QueryParameters } from '../../apiProxy';
+import { QueryParameters } from '../../api/v1/queryParameters';
+import { ApiError } from '../../api/v2/ApiError';
 import { KubeObject, KubeObjectInterface } from '../../KubeObject';
 import { clusterFetch } from './fetch';
 import { KubeListUpdateEvent } from './KubeList';
diff --git a/frontend/src/lib/k8s/crd.ts b/frontend/src/lib/k8s/crd.ts
@@ -15,7 +15,7 @@
  */
 
 import { ResourceClasses } from '.';
-import { apiFactory, apiFactoryWithNamespace } from './apiProxy';
+import { apiFactory, apiFactoryWithNamespace } from './api/v1/factories';
 import { KubeObject } from './KubeObject';
 import { KubeObjectInterface } from './KubeObject';
 import { KubeObjectClass } from './KubeObject';
diff --git a/frontend/src/lib/k8s/event.ts b/frontend/src/lib/k8s/event.ts
@@ -17,8 +17,9 @@
 import _ from 'lodash';
 import React, { useMemo } from 'react';
 import { ResourceClasses } from '.';
-import { ApiError, QueryParameters } from './apiProxy';
-import { request } from './apiProxy';
+import { request } from './api/v1/clusterRequests';
+import { QueryParameters } from './api/v1/queryParameters';
+import { ApiError } from './api/v2/ApiError';
 import { KubeMetadata } from './KubeMetadata';
 import { KubeObject } from './KubeObject';
 import { KubeObjectClass } from './KubeObject';
diff --git a/frontend/src/lib/k8s/index.ts b/frontend/src/lib/k8s/index.ts
@@ -20,7 +20,8 @@ import { useHistory } from 'react-router-dom';
 import { ConfigState } from '../../redux/configSlice';
 import { useTypedSelector } from '../../redux/hooks';
 import { getCluster, getSelectedClusters } from '../cluster';
-import { ApiError, clusterRequest } from './apiProxy';
+import { clusterRequest } from './api/v1/clusterRequests';
+import { ApiError } from './api/v2/ApiError';
 import { Cluster, LabelSelector, StringDict } from './cluster';
 import ClusterRole from './clusterRole';
 import ClusterRoleBinding from './clusterRoleBinding';
diff --git a/frontend/src/lib/k8s/node.ts b/frontend/src/lib/k8s/node.ts
@@ -17,7 +17,8 @@
 import React from 'react';
 import { useErrorState } from '../util';
 import { useConnectApi } from '.';
-import { ApiError, metrics } from './apiProxy';
+import { metrics } from './api/v1/metricsApi';
+import { ApiError } from './api/v2/ApiError';
 import { KubeCondition, KubeMetrics } from './cluster';
 import { KubeObject, KubeObjectInterface } from './KubeObject';
 
diff --git a/frontend/src/lib/k8s/pod.ts b/frontend/src/lib/k8s/pod.ts
@@ -15,7 +15,8 @@
  */
 
 import { Base64 } from 'js-base64';
-import { post, stream, StreamArgs, StreamResultsCb } from './apiProxy';
+import { post } from './api/v1/clusterRequests';
+import { stream, StreamArgs, StreamResultsCb } from './api/v1/streamingApi';
 import { KubeCondition, KubeContainer, KubeContainerStatus, Time } from './cluster';
 import { KubeObject, KubeObjectInterface } from './KubeObject';
 
diff --git a/frontend/src/lib/k8s/vpa.ts b/frontend/src/lib/k8s/vpa.ts
@@ -15,7 +15,7 @@
  */
 
 import { ResourceClasses } from '.';
-import { request } from './apiProxy';
+import { request } from './api/v1/clusterRequests';
 import { KubeObject } from './KubeObject';
 import { KubeObjectInterface } from './KubeObject';
 import { KubeObjectClass } from './KubeObject';
diff --git a/frontend/src/lib/util.ts b/frontend/src/lib/util.ts
@@ -22,7 +22,7 @@ import { filterGeneric, filterResource } from '../redux/filterSlice';
 import { useTypedSelector } from '../redux/hooks';
 import store from '../redux/stores/store';
 import { getCluster, getClusterGroup, getClusterPrefixedPath } from './cluster';
-import { ApiError } from './k8s/apiProxy';
+import { ApiError } from './k8s/api/v2/ApiError';
 import { KubeMetrics } from './k8s/cluster';
 import { KubeEvent } from './k8s/event';
 import { KubeObjectInterface } from './k8s/KubeObject';
diff --git a/frontend/src/plugin/lib.ts b/frontend/src/plugin/lib.ts
@@ -16,6 +16,7 @@
 
 import { getProductName, getVersion } from '../helpers/getProductInfo';
 import { isElectron } from '../helpers/isElectron';
+import { setCluster } from '../lib/k8s/api/v1/clusterApi';
 /**
  * The lib.ts file should carry the bits to be used by plugins whereas
  * the index.ts should have the functions that Headlamp itself needs for
@@ -46,7 +47,7 @@ import { isElectron } from '../helpers/isElectron';
  *
  * @see {@link https://headlamp.dev/docs/latest/development/plugins/functionality/ Plugin functionality}
  */
-import { ClusterRequest, setCluster } from '../lib/k8s/apiProxy';
+import { ClusterRequest } from '../lib/k8s/api/v1/clusterRequests';
 import Registry from './registry';
 
 /**
diff --git a/frontend/src/redux/clusterProviderSlice.ts b/frontend/src/redux/clusterProviderSlice.ts
@@ -15,7 +15,7 @@
  */
 
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import type { ApiError } from '../lib/k8s/apiProxy';
+import type { ApiError } from '../lib/k8s/api/v2/ApiError';
 
 export interface DialogProps {
   cluster: any;
diff --git a/frontend/src/stateless/index.ts b/frontend/src/stateless/index.ts
@@ -17,8 +17,8 @@
 import * as jsyaml from 'js-yaml';
 import _ from 'lodash';
 import { addBackstageAuthHeaders } from '../helpers/addBackstageAuthHeaders';
+import { request } from '../lib/k8s/api/v1/clusterRequests';
 import { JSON_HEADERS } from '../lib/k8s/api/v1/constants';
-import { request } from '../lib/k8s/apiProxy';
 import { Cluster } from '../lib/k8s/cluster';
 import { KubeconfigObject } from '../lib/k8s/kubeconfig';
 import { ConfigState, setStatelessConfig } from '../redux/configSlice';
