From d9593a20e7ef2d9206e975c433423d9f6ec8e8db Mon Sep 17 00:00:00 2001 From: Tobias Persson Date: Fri, 21 Feb 2025 12:49:07 +0100 Subject: [PATCH] Set limits on all containers in ESR Also add CPU limits and requests in the suite runner template --- internal/controller/testrun_controller.go | 20 ++++++++++++++++++++ internal/etos/suitestarter/suitestarter.go | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/internal/controller/testrun_controller.go b/internal/controller/testrun_controller.go index f3d27476..78ce0edc 100644 --- a/internal/controller/testrun_controller.go +++ b/internal/controller/testrun_controller.go @@ -557,6 +557,16 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Name: "kubexit", Image: "karlkfi/kubexit:latest", Command: []string{"cp", "/bin/kubexit", "/kubexit/kubexit"}, + Resources: corev1.ResourceRequirements{ + Limits: corev1.ResourceList{ + corev1.ResourceMemory: resource.MustParse("64Mi"), + corev1.ResourceCPU: resource.MustParse("250m"), + }, + Requests: corev1.ResourceList{ + corev1.ResourceMemory: resource.MustParse("32Mi"), + corev1.ResourceCPU: resource.MustParse("100m"), + }, + }, VolumeMounts: []corev1.VolumeMount{ { Name: "kubexit", @@ -569,6 +579,16 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Image: testrun.Spec.LogListener.Image.Image, ImagePullPolicy: testrun.Spec.LogListener.ImagePullPolicy, Command: []string{"python", "-u", "-m", "create_queue"}, + Resources: corev1.ResourceRequirements{ + Limits: corev1.ResourceList{ + corev1.ResourceMemory: resource.MustParse("256Mi"), + corev1.ResourceCPU: resource.MustParse("250m"), + }, + Requests: corev1.ResourceList{ + corev1.ResourceMemory: resource.MustParse("128Mi"), + corev1.ResourceCPU: resource.MustParse("100m"), + }, + }, EnvFrom: []corev1.EnvFromSource{ { SecretRef: &corev1.SecretEnvSource{ diff --git a/internal/etos/suitestarter/suitestarter.go b/internal/etos/suitestarter/suitestarter.go index f8791a0e..0b87f7cc 100644 --- a/internal/etos/suitestarter/suitestarter.go +++ b/internal/etos/suitestarter/suitestarter.go @@ -604,8 +604,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "32Mi" + cpu: "100m" limits: memory: "64Mi" + cpu: "250m" volumeMounts: - mountPath: /kubexit name: kubexit @@ -615,8 +617,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "128Mi" + cpu: "100m" limits: memory: "256Mi" + cpu: "250m" envFrom: - secretRef: name: {etos_configmap} @@ -635,8 +639,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "150Mi" + cpu: "100m" limits: memory: "300Mi" + cpu: "250m" envFrom: - secretRef: name: {etos_configmap} @@ -668,8 +674,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "128Mi" + cpu: "100m" limits: memory: "256Mi" + cpu: "250m" envFrom: - secretRef: name: {etos_configmap}