feat: support configuring component resources via configs, update resource defaults

.projenrc.ts

@@ -365,7 +365,7 @@ const Cdk8sConstructBuilder = new ProjectBuilder(cdk8s.ConstructLibraryCdk8s)
 // K8s Constructs
 const k8sComponentConstruct = Cdk8sConstructBuilder.build({
 	name: 'k8s.construct.component',
-	deps: ['debug', 'defu', 'js-yaml'],
+	deps: ['debug', 'defu', 'js-yaml', 'zod'],
 	devDeps: ['@types/debug'],
 	jest: false,
 })

packages/charts/crisiscleanup/src/schema.ts

@@ -12,6 +12,23 @@ const containerImageSchema = z
 
 const metricPercent = z.number().min(0).max(100)
 
+const K8sMillicores = z.number().describe('Kubernetes CPU Millicores')
+const K8sMemoryMebibytes = z.number().describe('Kubernetes Memory Mebibytes')
+
+const resourcesSchema = z
+	.object({
+		cpu: z.object({
+			limit: K8sMillicores.optional(),
+			request: K8sMillicores.optional(),
+		}),
+		memory: z.object({
+			limit: K8sMemoryMebibytes.optional(),
+			request: K8sMemoryMebibytes.optional(),
+		}),
+	})
+	.describe('Kubernetes resource limits/requests')
+	.deepPartial()
+
 const scalingSchema = z
 	.object({
 		minReplicas: z.number().optional(),
@@ -32,6 +49,7 @@ const scalingSchema = z
 const deploymentSchema = z.object({
 	image: containerImageSchema.optional(),
 	spread: z.boolean().default(false),
+	resources: resourcesSchema.optional(),
 })
 
 const withScaling = <T extends typeof deploymentSchema>(inSchema: T) =>

packages/k8s/construct/api/src/api.ts

@@ -205,6 +205,17 @@ export class ApiWSGI
 		}) as ApiWSGIProps
 		super(scope, id, propsWithDefaults)
 
+		const resources = this.getResources({
+			cpu: {
+				request: 1000,
+				limit: 1800,
+			},
+			memory: {
+				request: 1200,
+				limit: 1200,
+			},
+		})
+
 		const backend = this.addContainer({
 			name: 'gunicorn',
 			portNumber: 5000,
@@ -220,13 +231,7 @@ export class ApiWSGI
 				'--timeout=90',
 			],
 			...(props.probes ?? this.createHttpProbes(this.httpProbePath)),
-			resources: {
-				cpu: this.props.containerDefaults!.resources!.cpu!,
-				memory: {
-					request: Size.mebibytes(1200),
-					limit: Size.mebibytes(1200),
-				},
-			},
+			resources,
 		})
 
 		const staticVolume = kplus.Volume.fromEmptyDir(
@@ -342,6 +347,14 @@ export class ApiASGI
 				user: 1000,
 				group: 1000,
 			},
+			resources: {
+				// todo: properly expose via configs
+				memory: this.props.containerDefaults!.resources!.memory!,
+				cpu: {
+					request: kplus.Cpu.millis(500),
+					limit: kplus.Cpu.millis(1500),
+				},
+			},
 		})
 
 		// rag channels stateful set
@@ -392,7 +405,7 @@ export class ApiASGI
 			},
 			resources: {
 				cpu: {
-					limit: kplus.Cpu.units(3),
+					//limit: kplus.Cpu.units(3),
 					request: kplus.Cpu.millis(200),
 				},
 				memory: {
@@ -514,6 +527,15 @@ export class CeleryBeat extends ApiComponent {
 
 	constructor(scope: Construct, id: string, props: ApiProps) {
 		super(scope, id, props)
+		const resources = this.getResources({
+			cpu: {
+				request: 20,
+			},
+			memory: {
+				request: 400,
+				limit: 400,
+			},
+		})
 		this.addContainer({
 			name: 'celerybeat',
 			command: ['/serve.sh', 'celerybeat'],
@@ -524,15 +546,7 @@ export class CeleryBeat extends ApiComponent {
 				user: 1000,
 				group: 1000,
 			},
-			resources: {
-				cpu: {
-					request: kplus.Cpu.millis(20),
-				},
-				memory: {
-					request: Size.mebibytes(400),
-					limit: Size.mebibytes(400),
-				},
-			},
+			resources,
 		})
 	}
 
@@ -552,6 +566,13 @@ export class CeleryWorker extends ApiComponent<CeleryProps> {
 
 		const queues = [...new Set(props.queues)]
 
+		const resources = this.getResources({
+			memory: {
+				limit: 900,
+				request: 900,
+			},
+		})
+
 		this.addContainer({
 			name,
 			command: [
@@ -571,13 +592,7 @@ export class CeleryWorker extends ApiComponent<CeleryProps> {
 				user: 1000,
 				group: 1000,
 			},
-			resources: {
-				cpu: this.props.containerDefaults!.resources!.cpu!,
-				memory: {
-					limit: Size.mebibytes(900),
-					request: Size.mebibytes(900),
-				},
-			},
+			resources,
 		})
 	}
 }
@@ -587,6 +602,15 @@ export class AdminWebSocket extends ApiComponent {
 
 	constructor(scope: Construct, id: string, props: ApiProps) {
 		super(scope, id, props)
+		const resources = this.getResources({
+			cpu: {
+				request: 3,
+			},
+			memory: {
+				request: 250,
+				limit: 250,
+			},
+		})
 		this.addContainer({
 			name: 'adminwebsocket',
 			command: ['/serve.sh', 'adminwebsocket'],
@@ -597,15 +621,7 @@ export class AdminWebSocket extends ApiComponent {
 				user: 1000,
 				group: 1000,
 			},
-			resources: {
-				cpu: {
-					request: kplus.Cpu.millis(3),
-				},
-				memory: {
-					request: Size.mebibytes(250),
-					limit: Size.mebibytes(250),
-				},
-			},
+			resources,
 		})
 	}
 }