feat: Support resource reservations on Docker compose import

cli/cli/commands/import/import.go

@@ -25,6 +25,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 )
 
@@ -40,6 +41,9 @@ const (
 	emptyPrivateIpPlaceholder = ""
 	defaultMainFunction       = ""
 	noStarlarkParams          = "{}"
+	cpuToMilliCpuConstant     = 1024
+	bytesToMegabytes          = 1024 * 1024
+	float64BitWidth           = 64
 	readWriteEveryone         = 0666
 
 	// Signifies that an enclave name should be auto-generated
@@ -221,13 +225,19 @@ func convertComposeProjectToStarlark(compose *types.Project) (string, map[string
 			}
 			envvarsPiecesStr = append(envvarsPiecesStr, fmt.Sprintf("%s=%s", envKey, envValueStr))
 		}
+		memMinLimit := getMemoryMegabytesReservation(serviceConfig.Deploy)
+		cpuMinLimit := getMilliCpusReservation(serviceConfig.Deploy)
 		starlarkConfig, err := add.GetServiceConfigStarlark(
 			serviceConfig.Image,
 			strings.Join(portPiecesStr, ","),
 			serviceConfig.Command,
 			serviceConfig.Entrypoint,
 			strings.Join(envvarsPiecesStr, ","),
 			strings.Join(artifactsPiecesStr, ","),
+			0,
+			0,
+			cpuMinLimit,
+			memMinLimit,
 			emptyPrivateIpPlaceholder)
 		if err != nil {
 			return "", nil, stacktrace.Propagate(err, "Error getting service config starlark for '%v'", serviceConfig)
@@ -241,6 +251,36 @@ func convertComposeProjectToStarlark(compose *types.Project) (string, map[string
 	return script, requiredFileUploads, nil
 }
 
+func getMemoryMegabytesReservation(deployConfig *types.DeployConfig) int {
+	if deployConfig == nil {
+		return 0
+	}
+	reservation := 0
+	if deployConfig.Resources.Reservations != nil {
+		reservation = int(deployConfig.Resources.Reservations.MemoryBytes) / bytesToMegabytes
+		logrus.Debugf("Converted '%v' bytes to '%v' megabytes", deployConfig.Resources.Reservations.MemoryBytes, reservation)
+	}
+	return reservation
+}
+
+func getMilliCpusReservation(deployConfig *types.DeployConfig) int {
+	if deployConfig == nil {
+		return 0
+	}
+	reservation := 0
+	if deployConfig.Resources.Reservations != nil {
+		reservationParsed, err := strconv.ParseFloat(deployConfig.Resources.Reservations.NanoCPUs, float64BitWidth)
+		if err == nil {
+			// Despite being called 'nano CPUs', they actually refer to a float representing percentage of one CPU
+			reservation = int(reservationParsed * cpuToMilliCpuConstant)
+			logrus.Debugf("Converted '%v' CPUs to '%v' milli CPUs", deployConfig.Resources.Reservations.NanoCPUs, reservation)
+		} else {
+			logrus.Warnf("Could not convert CPU reservation '%v' to integer, limits reservation", deployConfig.Resources.Reservations.NanoCPUs)
+		}
+	}
+	return reservation
+}
+
 func createEnclave(ctx context.Context, kurtosisCtx *kurtosis_context.KurtosisContext, enclaveName string) (*enclaves.EnclaveContext, error) {
 	enclaveCtx, err := kurtosisCtx.CreateEnclave(ctx, enclaveName, false)
 	if err != nil {

cli/cli/commands/service/add/add.go

@@ -59,6 +59,7 @@ const (
 	filesFlagKey                     = "files"
 	filesArtifactMountsDelimiter     = ","
 	filesArtifactMountpointDelimiter = ":"
+	defaultLimits                    = 0
 
 	kurtosisBackendCtxKey = "kurtosis-backend"
 	engineClientCtxKey    = "engine-client"
@@ -293,7 +294,7 @@ func run(
 	if entrypointStr != "" {
 		entrypoint = append(entrypoint, entrypointStr)
 	}
-	serviceConfigStarlark, err := GetServiceConfigStarlark(image, portsStr, cmdArgs, entrypoint, envvarsStr, filesArtifactMountsStr, privateIPAddressPlaceholder)
+	serviceConfigStarlark, err := GetServiceConfigStarlark(image, portsStr, cmdArgs, entrypoint, envvarsStr, filesArtifactMountsStr, defaultLimits, defaultLimits, defaultLimits, defaultLimits, privateIPAddressPlaceholder)
 	if err != nil {
 		return stacktrace.Propagate(
 			err,
@@ -423,6 +424,10 @@ func GetServiceConfigStarlark(
 	entrypoint []string,
 	envvarsStr string,
 	filesArtifactMountsStr string,
+	cpuAllocationMillicpus int,
+	memoryAllocationMegabytes int,
+	minCpuMilliCores int,
+	minMemoryMegaBytes int,
 	privateIPAddressPlaceholder string,
 ) (string, error) {
 	envvarsMap, err := parseEnvVarsStr(envvarsStr)
@@ -439,7 +444,7 @@ func GetServiceConfigStarlark(
 	if err != nil {
 		return "", stacktrace.Propagate(err, "An error occurred parsing files artifact mounts string '%v'", filesArtifactMountsStr)
 	}
-	return services.GetServiceConfigStarlark(image, ports, filesArtifactMounts, entrypoint, cmdArgs, envvarsMap, "", privateIPAddressPlaceholder, 0, 0, 0, 0), nil
+	return services.GetServiceConfigStarlark(image, ports, filesArtifactMounts, entrypoint, cmdArgs, envvarsMap, "", privateIPAddressPlaceholder, cpuAllocationMillicpus, memoryAllocationMegabytes, minCpuMilliCores, minMemoryMegaBytes), nil
 }
 
 // Parses a string in the form KEY1=VALUE1,KEY2=VALUE2 into a map of strings