Merge pull request #15728 from tyler92/fix-cpu-millis-limit

Fix CPU usage limitation in play kube for non integer values
This commit is contained in:
OpenShift Merge Robot 2022-09-10 17:40:01 +02:00 committed by GitHub
commit b9cbc0c09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions

View File

@ -207,12 +207,9 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
s.SeccompProfilePath = opts.SeccompPaths.FindForContainer(opts.Container.Name) s.SeccompProfilePath = opts.SeccompPaths.FindForContainer(opts.Container.Name)
s.ResourceLimits = &spec.LinuxResources{} s.ResourceLimits = &spec.LinuxResources{}
milliCPU, err := quantityToInt64(opts.Container.Resources.Limits.Cpu()) milliCPU := opts.Container.Resources.Limits.Cpu().MilliValue()
if err != nil {
return nil, fmt.Errorf("failed to set CPU quota: %w", err)
}
if milliCPU > 0 { if milliCPU > 0 {
period, quota := util.CoresToPeriodAndQuota(float64(milliCPU)) period, quota := util.CoresToPeriodAndQuota(float64(milliCPU) / 1000)
s.ResourceLimits.CPU = &spec.LinuxCPU{ s.ResourceLimits.CPU = &spec.LinuxCPU{
Quota: &quota, Quota: &quota,
Period: &period, Period: &period,