chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not override pipeline-defined resource limits

Browse Source
This commit is contained in:
Brad Rydzewski
2020-01-27 14:32:12 -08:00
parent 4168cf0fd2
commit 754c8d44a7
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/compiler/compiler.go
View File

@@ -351,8 +351,15 @@ func (c *Compiler) Compile(ctx context.Context, args runtime.CompilerArgs) runti
// append global resource limits to steps
for _, step := range spec.Steps {
step.MemSwapLimit = c.Resources.MemorySwap
step.MemLimit = c.Resources.Memory
// the resource limits defined in the yaml currently
// take precedence over global values. This is something
// we should re-think in a future release.
if step.MemSwapLimit != 0 {
step.MemSwapLimit = c.Resources.MemorySwap
}
if step.MemLimit != 0 {
step.MemLimit = c.Resources.Memory
}
step.CPUPeriod = c.Resources.CPUPeriod
step.CPUQuota = c.Resources.CPUQuota
step.CPUShares = c.Resources.CPUShares