fix(ds, mm): hard code disk per core

svc/pkg/ds/src/workflows/server/mod.rs

@@ -477,7 +477,7 @@ async fn submit_job(ctx: &ActivityCtx, input: &SubmitJobInput) -> GlobalResult<S
 		// Nomad configures CPU based on MHz, not millicores. We havel to calculate the CPU share
 		// by knowing how many MHz are on the client.
 		CPU: if tier.rivet_cores_numerator < tier.rivet_cores_denominator {
-			Some((tier.cpu - util_job::TASK_CLEANUP_CPU as u64).try_into()?)
+			Some(tier.cpu.try_into()?)
 		} else {
 			None
 		},
@@ -486,20 +486,10 @@ async fn submit_job(ctx: &ActivityCtx, input: &SubmitJobInput) -> GlobalResult<S
 		} else {
 			None
 		},
-		memory_mb: Some(
-			(TryInto::<i64>::try_into(memory)? / (1024 * 1024)
-				- util_job::TASK_CLEANUP_MEMORY as i64)
-				.try_into()?,
-		),
+		memory_mb: Some(tier.memory.try_into()?),
 		// Allow oversubscribing memory by 50% of the reserved
 		// memory if using less than the node's total memory
-		memory_max_mb: None,
-		// Some(
-		// 	(TryInto::<i64>::try_into(memory_max)? / (1024 * 1024)
-		// 		- util_job::TASK_CLEANUP_MEMORY as i64)
-		// 		.try_into()?,
-		// ),
-		disk_mb: Some(tier.disk as i32), // TODO: Is this deprecated?
+		memory_max_mb: Some(tier.memory_max.try_into()?),
 		..Resources::new()
 	};
 

svc/pkg/linode/src/util/mod.rs

@@ -12,6 +12,7 @@ const RESERVE_LB_MEMORY: u64 = 512;
 const RESERVE_MEMORY: u64 = RESERVE_SYSTEM_MEMORY + RESERVE_LB_MEMORY;
 
 const CPU_PER_CORE: u64 = 1999;
+const DISK_PER_CORE: u64 = 8192;
 
 /// Provider agnostic hardware specs.
 #[derive(Debug)]
@@ -53,7 +54,7 @@ impl JobNodeConfig {
 	}
 
 	pub fn disk_per_core(&self) -> u64 {
-		self.disk / self.cpu_cores
+		DISK_PER_CORE
 	}
 
 	pub fn bandwidth_per_core(&self) -> u64 {

svc/pkg/mm/worker/src/workers/lobby_create/nomad_job.rs

@@ -107,7 +107,6 @@ pub fn gen_lobby_docker_job(
 		// Allow oversubscribing memory by 50% of the reserved
 		// memory if using less than the node's total memory
 		memory_max_mb: Some(tier.memory_max.try_into()?),
-		disk_mb: Some(tier.disk as i32), // TODO: Is this deprecated?
 		..Resources::new()
 	};