diff --git a/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts b/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts index 39477f7c8..2f060db65 100644 --- a/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts +++ b/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts @@ -21,7 +21,6 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (kube_user === null) { return jsonRes(resp, { code: 404, message: 'user not found' }); } - const kube_namespace = kc.getContexts()[0].namespace; // get payment crd type paymentStatus = { tradeNo: string; @@ -31,7 +30,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse const paymentM = { ...paymentMeta, - namespace: kube_namespace || GetUserDefaultNameSpace(kube_user.name) + namespace: GetUserDefaultNameSpace(kube_user.name) }; const paymentDesc = await GetCRD(kc, paymentM, id); //@ts-ignore diff --git a/frontend/providers/costcenter/src/pages/api/account/transfer.ts b/frontend/providers/costcenter/src/pages/api/account/transfer.ts index 2d7a7ace0..048f1b3f7 100644 --- a/frontend/providers/costcenter/src/pages/api/account/transfer.ts +++ b/frontend/providers/costcenter/src/pages/api/account/transfer.ts @@ -34,7 +34,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse return jsonRes(resp, { code: 401, message: 'user not found' }); } - const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(kubeUser.name); + const namespace = GetUserDefaultNameSpace(kubeUser.name); const name = to + '-' + getTime(new Date()); const transferCRD = generateTransferCrd({ to, diff --git a/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx b/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx index eea1f6e20..039aca5d7 100644 --- a/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx +++ b/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx @@ -11,7 +11,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (user === null) { return jsonRes(resp, { code: 403, message: 'user null' }); } - const namespace = GetUserDefaultNameSpace(user.name); + const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(user.name); const name = new Date().getTime() + 'appquery'; const crdSchema = { apiVersion: `account.sealos.io/v1`, diff --git a/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx b/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx index 5ac93c47b..ea6d5ae7c 100644 --- a/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx +++ b/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx @@ -1,5 +1,5 @@ import { authSession } from '@/service/backend/auth'; -import { CRDMeta, GetCRD } from '@/service/backend/kubernetes'; +import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes'; import { jsonRes } from '@/service/backend/response'; import type { NextApiRequest, NextApiResponse } from 'next'; import { ApplyYaml } from '@/service/backend/kubernetes'; @@ -44,7 +44,8 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (user === null) { return jsonRes(resp, { code: 403, message: 'user null' }); } - const namespace = kc.getContexts()[0].namespace || 'ns-' + user.name; + // 要和kc保持一致 + const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(user.name); const name = new Date().getTime() + 'namespacequery'; const crdSchema = { apiVersion: `account.sealos.io/v1`, diff --git a/frontend/providers/costcenter/src/pages/api/billing/index.ts b/frontend/providers/costcenter/src/pages/api/billing/index.ts index 2c36df0a0..654c22cdc 100644 --- a/frontend/providers/costcenter/src/pages/api/billing/index.ts +++ b/frontend/providers/costcenter/src/pages/api/billing/index.ts @@ -1,5 +1,5 @@ import { authSession } from '@/service/backend/auth'; -import { CRDMeta, GetCRD } from '@/service/backend/kubernetes'; +import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes'; import { jsonRes } from '@/service/backend/response'; import type { NextApiRequest, NextApiResponse } from 'next'; import { ApplyYaml } from '@/service/backend/kubernetes'; @@ -42,7 +42,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse if (user === null) { return jsonRes(resp, { code: 403, message: 'user null' }); } - const namespace = 'ns-' + user.name; + const namespace = GetUserDefaultNameSpace(user.name); const body = req.body; let spec: BillingSpec = body.spec; if (!spec) {