elysium/minecluster
elysium/minecluster
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[FEATURE] Basic changes for basic testing in cubit (#11)

Browse source 
Co-authored-by: Dunemask <dunemask@gmail.com>
Reviewed-on: https://gitea.dunemask.dev/elysium/minecluster/pulls/11
This commit is contained in:
dunemask 2024-02-04 04:59:38 +00:00
parent 4390f90b1c
commit edbfc2348a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/controllers/lifecycle-controller.js
View file

@ -84,7 +84,7 @@ export async function createServer(req, res) {
try { try {
const serverEntry = await createServerEntry(serverSpec); const serverEntry = await createServerEntry(serverSpec);
await createServerResources(serverEntry); await createServerResources(serverEntry);
res.sendStatus(200); res.json(serverEntry);
} catch (e) { } catch (e) {
sendError(res)(e); sendError(res)(e);
} }

7
lib/k8s/server-status.js
View file

@ -39,7 +39,7 @@ function getServerStatus(server) {
) !== undefined; ) !== undefined;
const serverAvailable = services.includes(`server`) && deploymentAvailable; const serverAvailable = services.includes(`server`) && deploymentAvailable;
const ftpAvailable = services.includes("ftp"); // TODO this needs some handling for container creation const ftpAvailable = services.includes("ftp"); // TODO this needs some handling for container creation
return { serverAvailable, ftpAvailable, services }; return { serverAvailable, ftpAvailable, services, deploymentAvailable };
} }
export async function getInstances() { export async function getInstances() {
@ -53,15 +53,18 @@ export async function getInstances() {
const serverInstances = serverDeployments.map((s) => { const serverInstances = serverDeployments.map((s) => {
serverId = s.metadata.annotations["minecluster.dunemask.net/id"]; serverId = s.metadata.annotations["minecluster.dunemask.net/id"];
const entry = entries.find((e) => e.id === serverId); const entry = entries.find((e) => e.id === serverId);
const { ftpAvailable, serverAvailable, services } = getServerStatus(s); const { ftpAvailable, serverAvailable, services, deploymentAvailable } =
getServerStatus(s);
metrics = getServerMetrics(podMetricsRes, serverId, serverAvailable); metrics = getServerMetrics(podMetricsRes, serverId, serverAvailable);
return { return {
name: !!entry ? entry.name : "Unknown", name: !!entry ? entry.name : "Unknown",
host: !!entry ? entry.host : "Unkonwn",
id: serverId, id: serverId,
metrics, metrics,
services, services,
serverAvailable, serverAvailable,
ftpAvailable, ftpAvailable,
deploymentAvailable,
}; };
}); });
return serverInstances; return serverInstances;