From 19be5619d6b5a0fe02d02c76a0a4f76958244088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 14 Apr 2020 21:40:20 +0200 Subject: [PATCH] Resource limits seem to work ok when not rootless --- pkg/drivers/kic/oci/oci.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 78714ba0ea..60c7997498 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -139,11 +139,10 @@ func CreateContainerNode(p CreateParams) error { } if p.OCIBinary == Docker { runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var", p.Name)) - // setting resource limit in privileged mode is only supported by docker - // podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" - runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) } + runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) + for key, val := range p.Envs { runArgs = append(runArgs, "-e", fmt.Sprintf("%s=%s", key, val)) }