[FEATURE] Adjust more server controllers

This commit is contained in:
Dunemask 2023-12-18 03:55:27 -07:00
parent 62c966a6bd
commit 37e3dc2ae9
16 changed files with 281 additions and 173 deletions

View file

@ -1,6 +1,7 @@
import k8s from "@kubernetes/client-node";
import { ERR } from "../util/logging.js";
import { getServerAssets } from "./k8s-server-control.js";
import ExpressClientError from "../util/ExpressClientError.js";
const kc = new k8s.KubeConfig();
kc.loadFromDefault();
@ -8,24 +9,27 @@ const k8sDeps = kc.makeApiClient(k8s.AppsV1Api);
const k8sCore = kc.makeApiClient(k8s.CoreV1Api);
const namespace = process.env.MCL_SERVER_NAMESPACE;
const deleteError = (res) => (err) => {
res.status(500).send("Error deleting a resource!");
const deleteError = (err) => {
ERR("K8S", "An error occurred while deleting a resource", err);
throw new ExpressClientError({
c: 500,
m: "Error deleting a resource!\n" + err,
});
};
function deleteOnExist(o, fn) {
if (o) return fn(o.metadata.name);
}
export default async function deleteServer(req, res) {
const serverSpec = req.body;
if (!serverSpec) return res.sendStatus(400);
if (!serverSpec.name) return res.status(400).send("Server name required!");
export default async function deleteServerResources(serverSpec) {
const { name } = serverSpec;
// Ensure deployment exists
const server = await getServerAssets(name);
if (!server)
return res.status(404).send("No Resources for that server were found!");
throw new ExpressClientError({
c: 404,
m: "No Resources for that server were found!",
});
// Delete in reverse order
const deleteDeploy = deleteOnExist(server.deployment, (name) =>
@ -38,7 +42,7 @@ export default async function deleteServer(req, res) {
const deleteRconService = deleteOnExist(server.rconService, (name) =>
k8sCore.deleteNamespacedService(name, namespace),
);
if (deleteDeploy) await deleteDeploy.catch(deleteError(res));
if (deleteDeploy) await deleteDeploy.catch(deleteError);
const deleteRconSecret = deleteOnExist(server.rconSecret, (name) =>
k8sCore.deleteNamespacedSecret(name, namespace),
@ -47,12 +51,10 @@ export default async function deleteServer(req, res) {
k8sCore.deleteNamespacedPersistentVolumeClaim(name, namespace),
);
Promise.all([
return Promise.all([
deleteService,
deleteRconService,
deleteRconSecret,
deleteVolume,
])
.then(() => res.sendStatus(200))
.catch(deleteError(res));
]).catch(deleteError);
}