Skip to content

Commit

Permalink
fix template delete db (labring#4014)
Browse files Browse the repository at this point in the history
Signed-off-by: jingyang <[email protected]>
  • Loading branch information
zjy365 committed Sep 28, 2023
1 parent ffd13b3 commit 176f300
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions frontend/providers/template/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ README.md
!./FastDeployTemplates/.git
.yalc/
yalc.lock

FastDeployTemplates
fast_deploy_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export async function delBackupByName({

export default async function handler(req: NextApiRequest, res: NextApiResponse<ApiResp>) {
try {
const { name } = req.query as { name: string };
if (!name) {
const { instanceName } = req.query as { instanceName: string };
if (!instanceName) {
throw new Error('deploy name is empty');
}

Expand All @@ -63,16 +63,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
});

// get backup and delete
const backups = await getBackups({ dbName: name, req });
const backups = await getBackups({ dbName: instanceName, req });
await Promise.all(
backups.map((item) => delBackupByName({ backupName: item.metadata.name, req }))
);

// del role
await Promise.all([
k8sAuth.deleteNamespacedRole(name, namespace),
k8sAuth.deleteNamespacedRoleBinding(name, namespace),
k8sCore.deleteNamespacedServiceAccount(name, namespace)
k8sAuth.deleteNamespacedRole(instanceName, namespace),
k8sAuth.deleteNamespacedRoleBinding(instanceName, namespace),
k8sCore.deleteNamespacedServiceAccount(instanceName, namespace)
]);

// delete cluster
Expand All @@ -81,7 +81,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
'v1alpha1',
namespace,
'clusters',
name
instanceName
);
jsonRes(res);
} catch (err: any) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function AppList({ instanceName }: { instanceName: string }) {
onSuccess(data) {
appendResource(
data.map((item) => {
return { id: item.id, name: item.name, kind: 'AppLaunchpad' };
return { id: item.id, name: item.name, kind: 'DataBase' };
})
);
}
Expand Down

0 comments on commit 176f300

Please sign in to comment.