From 638d78516afae1d60f4b142943b6ceac51424714 Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Fri, 10 Jun 2022 11:02:13 +0200 Subject: [PATCH 1/2] parse deploy.resources.limit.cpus as float before converting Signed-off-by: Guillaume Lours --- pkg/compose/create.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index b823e296d..d06499f97 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -595,8 +595,9 @@ func setLimits(limits *types.Resource, resources *container.Resources) { resources.Memory = int64(limits.MemoryBytes) } if limits.NanoCPUs != "" { - i, _ := strconv.ParseInt(limits.NanoCPUs, 10, 64) - resources.NanoCPUs = i + if f, err := strconv.ParseFloat(limits.NanoCPUs, 64); err == nil { + resources.NanoCPUs = int64(f * 1e9) + } } } From e111b651b393544766d59671e2312cee06112504 Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Fri, 10 Jun 2022 11:05:17 +0200 Subject: [PATCH 2/2] add deploy.resourses.limits.pids to the managed resources Signed-off-by: Guillaume Lours --- pkg/compose/create.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index d06499f97..4b0969d54 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -599,6 +599,9 @@ func setLimits(limits *types.Resource, resources *container.Resources) { resources.NanoCPUs = int64(f * 1e9) } } + if limits.PIds > 0 { + resources.PidsLimit = &limits.PIds + } } func setBlkio(blkio *types.BlkioConfig, resources *container.Resources) {