[FEATURE] Adjust resource flow

This commit is contained in:
Dunemask 2023-12-15 21:07:04 -07:00
parent 61bf66c5c1
commit 8ef46ac02f

View file

@ -13,9 +13,8 @@ const deleteError = (res) => (err) => {
ERR("K8S", "An error occurred while deleting a resource", err);
};
async function deleteOnExist(o, fn) {
if (!o) return;
return fn(o.metadata.name);
function deleteOnExist(o, fn) {
if (o) return fn(o.metadata.name);
}
export default async function deleteServer(req, res) {
@ -26,10 +25,11 @@ export default async function deleteServer(req, res) {
// Ensure deployment exists
const server = await getServerAssets(name);
if (!server) return res.status(404).send("No Resources for that server were found!");
// Delete in reverse order
const deleteDeploy = deleteOnExist(
server.deployment,
(name)=> k8sDeps.deleteNamespacedDeployment(name, namespace),
(name) => k8sDeps.deleteNamespacedDeployment(name, namespace),
);
const deleteService = deleteOnExist(
@ -40,18 +40,15 @@ export default async function deleteServer(req, res) {
server.rconService,
(name) => k8sCore.deleteNamespacedService(name, namespace),
);
try {
await deleteDeploy;
} catch (e) {
return deleteError(res)(e);
}
if(deleteDeploy) await deleteDeploy.catch(deleteError(res))
const deleteRconSecret = deleteOnExist(
server.rconSecret,
(name)=> k8sCore.deleteNamespacedSecret(name, namespace),
(name) => k8sCore.deleteNamespacedSecret(name, namespace),
);
const deleteVolume = deleteOnExist(
server.volume,
(name)=>k8sCore.deleteNamespacedPersistentVolumeClaim(name, namespace),
(name) => k8sCore.deleteNamespacedPersistentVolumeClaim(name, namespace),
);
Promise.all([