Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit 9159965

Browse files
committed
#36 Add resource limits to lurcher, parser and hooks
1 parent 4d7fa89 commit 9159965

File tree

1 file changed

+31
-13
lines changed

1 file changed

+31
-13
lines changed

operator/controllers/execution/scan_controller.go

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
corev1 "k8s.io/api/core/v1"
3232
rbacv1 "k8s.io/api/rbac/v1"
3333
apierrors "k8s.io/apimachinery/pkg/api/errors"
34+
resource "k8s.io/apimachinery/pkg/api/resource"
3435
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3536
"k8s.io/apimachinery/pkg/runtime"
3637
"k8s.io/apimachinery/pkg/types"
@@ -439,6 +440,16 @@ func (r *ScanReconciler) startParser(scan *executionv1.Scan) error {
439440
findingsUploadURL,
440441
},
441442
ImagePullPolicy: "Always",
443+
Resources: corev1.ResourceRequirements{
444+
Requests: corev1.ResourceList{
445+
corev1.ResourceCPU: resource.MustParse("200m"),
446+
corev1.ResourceMemory: resource.MustParse("100Mi"),
447+
},
448+
Limits: corev1.ResourceList{
449+
corev1.ResourceCPU: resource.MustParse("400m"),
450+
corev1.ResourceMemory: resource.MustParse("200Mi"),
451+
},
452+
},
442453
},
443454
},
444455
AutomountServiceAccountToken: &automountServiceAccountToken,
@@ -598,19 +609,16 @@ func (r *ScanReconciler) constructJobForScan(scan *executionv1.Scan, scanType *e
598609
},
599610
},
600611
},
601-
// TODO Assign sane default limits for lurcher
602-
// Resources: corev1.ResourceRequirements{
603-
// Limits: map[corev1.ResourceName]resource.Quantity{
604-
// "": {
605-
// Format: "",
606-
// },
607-
// },
608-
// Requests: map[corev1.ResourceName]resource.Quantity{
609-
// "": {
610-
// Format: "",
611-
// },
612-
// },
613-
// },
612+
Resources: corev1.ResourceRequirements{
613+
Requests: corev1.ResourceList{
614+
corev1.ResourceCPU: resource.MustParse("20m"),
615+
corev1.ResourceMemory: resource.MustParse("20Mi"),
616+
},
617+
Limits: corev1.ResourceList{
618+
corev1.ResourceCPU: resource.MustParse("100m"),
619+
corev1.ResourceMemory: resource.MustParse("100Mi"),
620+
},
621+
},
614622
VolumeMounts: []corev1.VolumeMount{
615623
{
616624
Name: "scan-results",
@@ -1029,6 +1037,16 @@ func (r *ScanReconciler) createJobForHook(hook *executionv1.ScanCompletionHook,
10291037
Args: cliArgs,
10301038
Env: append(hook.Spec.Env, standardEnvVars...),
10311039
ImagePullPolicy: "IfNotPresent",
1040+
Resources: corev1.ResourceRequirements{
1041+
Requests: corev1.ResourceList{
1042+
corev1.ResourceCPU: resource.MustParse("200m"),
1043+
corev1.ResourceMemory: resource.MustParse("100Mi"),
1044+
},
1045+
Limits: corev1.ResourceList{
1046+
corev1.ResourceCPU: resource.MustParse("400m"),
1047+
corev1.ResourceMemory: resource.MustParse("200Mi"),
1048+
},
1049+
},
10321050
},
10331051
},
10341052
},

0 commit comments

Comments
 (0)