From 1c415d61a2607af3250e7579efa03218755976a6 Mon Sep 17 00:00:00 2001 From: donniean Date: Wed, 25 Sep 2024 10:28:22 +0800 Subject: [PATCH 1/2] chore: remove api /configs/gpu/kinds from server Signed-off-by: donniean --- server/controllers/view.js | 11 ++++------- server/services/session.js | 27 --------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/server/controllers/view.js b/server/controllers/view.js index baf6d4baaab..0a4eed48031 100644 --- a/server/controllers/view.js +++ b/server/controllers/view.js @@ -10,7 +10,6 @@ const { getK8sRuntime, getOAuthInfo, getClusterRole, - getSupportGpuList, getInstallerSpec, getTheme, } = require('../services/session'); @@ -182,10 +181,9 @@ const renderView = async ctx => { const clusterRole = await getClusterRole(ctx); const ksConfig = await getKSConfig(ctx); - const [user, runtime, supportGpuType, installer, installedExtensions] = await Promise.all([ + const [user, runtime, installer, installedExtensions] = await Promise.all([ getCurrentUser(ctx, clusterRole, ksConfig.multicluster), getK8sRuntime(ctx), - getSupportGpuList(ctx), getInstallerSpec(ctx), getInstalledExtensions(ctx), ]); @@ -201,7 +199,7 @@ const renderView = async ctx => { installedExtensions, config: { ...clientConfig, - supportGpuType: [...supportGpuType, ...clientConfig.supportGpuType], + supportGpuType: [...clientConfig.supportGpuType], }, }); } catch (err) { @@ -214,10 +212,9 @@ const renderV3View = async ctx => { const clusterRole = await getClusterRole(ctx); const ksConfig = await getKSConfig(ctx); - const [user, runtime, supportGpuType, installer] = await Promise.all([ + const [user, runtime, installer] = await Promise.all([ getCurrentUser(ctx, clusterRole, ksConfig.multicluster), getK8sRuntime(ctx), - getSupportGpuList(ctx), getInstallerSpec(ctx), ]); @@ -231,7 +228,7 @@ const renderV3View = async ctx => { clusterRole, config: { ...clientConfig, - supportGpuType: [...supportGpuType, ...clientConfig.supportGpuType], + supportGpuType: [...clientConfig.supportGpuType], }, }); } catch (err) { diff --git a/server/services/session.js b/server/services/session.js index 23885137c9d..5d68afcae87 100644 --- a/server/services/session.js +++ b/server/services/session.js @@ -404,32 +404,6 @@ const getClusterRole = async ctx => { return role; }; -const getSupportGpuList = async ctx => { - const token = ctx.cookies.get('token'); - let gpuKinds = []; - if (!token) { - return []; - } - try { - const list = await sendGatewayRequest({ - method: 'GET', - url: '/kapis/config.kubesphere.io/v1alpha2/configs/gpu/kinds', - token, - }); - if (Array.isArray(list)) { - const defaultGpu = list.filter(item => item.default).map(item => item.resourceName); - - const otherGpus = list.filter(item => !item.default).map(item => item.resourceName); - - gpuKinds = [...defaultGpu, ...otherGpus]; - } - } catch (error) { - console.error(error); - } - - return gpuKinds; -}; - const getOAuthInfo = async () => { let resp = []; try { @@ -566,7 +540,6 @@ module.exports = { getK8sRuntime, createUser, getClusterRole, - getSupportGpuList, getInstallerSpec, getTheme, }; From facab63f3d62a9b6c57fe9d30017222e9a6535b5 Mon Sep 17 00:00:00 2001 From: donniean Date: Wed, 25 Sep 2024 10:38:19 +0800 Subject: [PATCH 2/2] chore: remove api /clusterconfigurations?name=ks-installer from server Signed-off-by: donniean --- server/controllers/view.js | 11 ++++------- server/services/session.js | 22 ---------------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/server/controllers/view.js b/server/controllers/view.js index 0a4eed48031..fb7729d0ac2 100644 --- a/server/controllers/view.js +++ b/server/controllers/view.js @@ -10,7 +10,6 @@ const { getK8sRuntime, getOAuthInfo, getClusterRole, - getInstallerSpec, getTheme, } = require('../services/session'); @@ -181,17 +180,16 @@ const renderView = async ctx => { const clusterRole = await getClusterRole(ctx); const ksConfig = await getKSConfig(ctx); - const [user, runtime, installer, installedExtensions] = await Promise.all([ + const [user, runtime, installedExtensions] = await Promise.all([ getCurrentUser(ctx, clusterRole, ksConfig.multicluster), getK8sRuntime(ctx), - getInstallerSpec(ctx), getInstalledExtensions(ctx), ]); await renderIndex(ctx, { ksConfig: { ...ksConfig, - metrics_server: get(installer, 'metrics_server.enabled', false), + metrics_server: false, }, user, runtime, @@ -212,16 +210,15 @@ const renderV3View = async ctx => { const clusterRole = await getClusterRole(ctx); const ksConfig = await getKSConfig(ctx); - const [user, runtime, installer] = await Promise.all([ + const [user, runtime] = await Promise.all([ getCurrentUser(ctx, clusterRole, ksConfig.multicluster), getK8sRuntime(ctx), - getInstallerSpec(ctx), ]); await renderV3Index(ctx, { ksConfig: { ...ksConfig, - metrics_server: get(installer, 'metrics_server.enabled', false), + metrics_server: false, }, user, runtime, diff --git a/server/services/session.js b/server/services/session.js index 5d68afcae87..6695ca55351 100644 --- a/server/services/session.js +++ b/server/services/session.js @@ -485,27 +485,6 @@ const createUser = (params, token) => { }); }; -const getInstallerSpec = async ctx => { - const token = ctx.cookies.get('token'); - if (!token) { - return {}; - } - - try { - const result = await sendGatewayRequest({ - method: 'GET', - url: `/apis/installer.kubesphere.io/v1alpha1/clusterconfigurations?name=ks-installer`, - token, - }); - - return result.items[0].spec; - } catch (error) { - console.error(error); - } - - return {}; -}; - const getTheme = async () => { try { const theme = await sendGatewayRequest({ @@ -540,6 +519,5 @@ module.exports = { getK8sRuntime, createUser, getClusterRole, - getInstallerSpec, getTheme, };