Merge remote-tracking branch 'upstream/main' into feat/base-service-delivery

# Conflicts: # server/.env.example # server/internal/config/config.go # server/internal/service/delivery.go # server/internal/service/delivery_test.go
2026-07-28 09:34:37 +08:00
parent 8378427d3d 2e84a48847
commit 7b4b9d2ee7
11 changed files with 786 additions and 602 deletions
@@ -959,6 +959,9 @@ function mysqlDeliveryPayload(businessLineId: number) {
    cpu_cores: resources.cpuCores,
    memory_gb: resources.memoryGb,
    storage_gb: parseStorageGb(deliveryForm.disk),
+    cpu_milli: resources.cpuCores * 1000,
+    memory_mi: resources.memoryGb * 1024,
+    storage_gi: parseStorageGb(deliveryForm.disk),
    param_template: deliveryForm.paramTemplate,
    timezone: deliveryForm.timezone,
    lower_case_table_names: deliveryForm.lowerCaseTableNames,