[FEATURE] Migrated to new loading sequence (#6)
Co-authored-by: Dunemask <dunemask@gmail.com> Reviewed-on: https://gitea.dunemask.dev/elysium/minecluster/pulls/6
This commit is contained in:
parent
fb57c03ba7
commit
6eb4ed3e95
53 changed files with 1349 additions and 449 deletions
|
@ -20,10 +20,10 @@ const loadYaml = (f) => yaml.load(fs.readFileSync(path.resolve(f), "utf8"));
|
|||
const mineclusterManaged = (o) =>
|
||||
o.metadata &&
|
||||
o.metadata.annotations &&
|
||||
o.metadata.annotations["minecluster.dunemask.net/server-name"] !== undefined;
|
||||
o.metadata.annotations["minecluster.dunemask.net/id"] !== undefined;
|
||||
|
||||
export const serverMatch = (serverName) => (o) =>
|
||||
o.metadata.annotations["minecluster.dunemask.net/server-name"] === serverName;
|
||||
export const serverMatch = (serverId) => (o) =>
|
||||
o.metadata.annotations["minecluster.dunemask.net/id"] === serverId;
|
||||
|
||||
export async function getDeployments() {
|
||||
const deploymentRes = await k8sDeps.listNamespacedDeployment(namespace);
|
||||
|
@ -50,8 +50,8 @@ export async function getVolumes() {
|
|||
return serverVolumes;
|
||||
}
|
||||
|
||||
export function getServerAssets(serverName) {
|
||||
const serverFilter = serverMatch(serverName);
|
||||
export function getServerAssets(serverId) {
|
||||
const serverFilter = serverMatch(serverId);
|
||||
return Promise.all([
|
||||
getDeployments(),
|
||||
getServices(),
|
||||
|
@ -66,17 +66,18 @@ export function getServerAssets(serverName) {
|
|||
|
||||
if (deployments.length > 1) throw Error("Deployment filter broken!");
|
||||
if (volumes.length > 1) throw Error("Volume filter broken!");
|
||||
if (secrets.length > 1) throw Error("Secrets broken!");
|
||||
if (secrets.length > 2) throw Error("Secrets broken!");
|
||||
const serverAssets = {
|
||||
deployment: deployments[0],
|
||||
service: services.find(
|
||||
(s) => s.metadata.name === `mcl-${serverName}-server`,
|
||||
),
|
||||
service: services.find((s) => s.metadata.name.endsWith("-server")),
|
||||
volume: volumes[0],
|
||||
rconService: services.find(
|
||||
(s) => s.metadata.name === `mcl-${serverName}-rcon`,
|
||||
rconService: services.find((s) => s.metadata.name.endsWith("-rcon")),
|
||||
rconSecret: secrets.find((s) =>
|
||||
s.metadata.name.endsWith("-rcon-secret"),
|
||||
),
|
||||
backupSecret: secrets.find((s) =>
|
||||
s.metadata.name.endsWith("-backup-secret"),
|
||||
),
|
||||
rconSecret: secrets[0],
|
||||
};
|
||||
for (var k in serverAssets) if (serverAssets[k]) return serverAssets;
|
||||
// If no assets exist, return nothing
|
||||
|
@ -84,59 +85,51 @@ export function getServerAssets(serverName) {
|
|||
.catch((e) => ERR("SERVER ASSETS", e));
|
||||
}
|
||||
|
||||
export async function getDeployment(serverName) {
|
||||
export async function getDeployment(serverId) {
|
||||
const servers = await getDeployments();
|
||||
const serverDeployment = servers.find(
|
||||
(s) =>
|
||||
s.metadata.annotations["minecluster.dunemask.net/server-name"] ===
|
||||
serverName,
|
||||
(s) => s.metadata.annotations["minecluster.dunemask.net/id"] === serverId,
|
||||
);
|
||||
if (!serverDeployment)
|
||||
throw Error(`MCL Deployment '${serverName}' could not be found!`);
|
||||
throw Error(`MCL Deployment with ID '${serverId}' could not be found!`);
|
||||
|
||||
return serverDeployment;
|
||||
}
|
||||
|
||||
export async function getContainers(serverName) {
|
||||
const deployment = await getDeployment(serverName);
|
||||
export async function getContainers(serverId) {
|
||||
const deployment = await getDeployment(serverId);
|
||||
return deployment.spec.template.spec.containers;
|
||||
}
|
||||
|
||||
async function containerControl(serverName, deployment, scaleUp) {
|
||||
async function containerControl(serverSpec, deployment, scaleUp) {
|
||||
const { containers } = deployment.spec.template.spec;
|
||||
const depFtp = containers.find((c) => c.name.endsWith("-ftp"));
|
||||
const depServer = containers.find((c) => c.name.endsWith("-server"));
|
||||
const depBackup = containers.find((c) => c.name.endsWith("-backup"));
|
||||
const serverSpec = await getServerEntry(serverName);
|
||||
const ftpContainer = depFtp ?? getFtpContainer(serverSpec);
|
||||
const serverContainer = depServer ?? getCoreServerContainer(serverSpec);
|
||||
const backupContainer = depBackup ?? getBackupContainer(serverSpec);
|
||||
if (scaleUp) return [ftpContainer, serverContainer];
|
||||
if (scaleUp && serverSpec.backupEnabled)
|
||||
return [ftpContainer, serverContainer, backupContainer];
|
||||
else if (scaleUp) return [ftpContainer, serverContainer];
|
||||
return [ftpContainer];
|
||||
}
|
||||
|
||||
export async function toggleServer(serverName, scaleUp = false) {
|
||||
const deployment = await getDeployment(serverName);
|
||||
deployment.spec.template.spec.containers = await containerControl(
|
||||
serverName,
|
||||
deployment,
|
||||
scaleUp,
|
||||
);
|
||||
return k8sDeps.replaceNamespacedDeployment(
|
||||
deployment.metadata.name,
|
||||
namespace,
|
||||
deployment,
|
||||
);
|
||||
export function terminationControl(containers) {
|
||||
return containers.length > 1 ? 30 /*seconds*/ : 1 /*seconds */;
|
||||
}
|
||||
|
||||
export async function scaleDeployment(serverName, scaleUp = false) {
|
||||
const deployment = await getDeployment(serverName);
|
||||
if (deployment.spec.replicas === 1 && scaleUp)
|
||||
return VERB(
|
||||
"KSC",
|
||||
`MCL Deployment '${serverName}' is already scaled! Ignoring scale adjustment.`,
|
||||
);
|
||||
deployment.spec.replicas = scaleUp ? 1 : 0;
|
||||
export async function toggleServer(serverId, scaleUp = false) {
|
||||
const [deployment, serverSpec] = await Promise.all([
|
||||
getDeployment(serverId),
|
||||
getServerEntry(serverId),
|
||||
]);
|
||||
const containers = await containerControl(serverSpec, deployment, scaleUp);
|
||||
const ts = terminationControl(containers);
|
||||
|
||||
// Speed up container termination if not running a server
|
||||
deployment.spec.template.spec.terminationGracePeriodSeconds = ts;
|
||||
deployment.spec.template.spec.containers = containers;
|
||||
|
||||
return k8sDeps.replaceNamespacedDeployment(
|
||||
deployment.metadata.name,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue