From 7d7465bfbb280257621dd4ea823c514a5895fc93 Mon Sep 17 00:00:00 2001 From: Andrei Matveyeu Date: Tue, 25 Mar 2025 14:02:11 +0100 Subject: [PATCH 1/3] Adjust CPU limits for Suite Runner Change-Id: I6f3ef1388806bd3322c4f22ddda39db13da404ca --- internal/controller/testrun_controller.go | 8 ++++---- internal/etos/suitestarter/suitestarter.go | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/controller/testrun_controller.go b/internal/controller/testrun_controller.go index e88fd3b6..0000ff29 100644 --- a/internal/controller/testrun_controller.go +++ b/internal/controller/testrun_controller.go @@ -617,11 +617,11 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("256Mi"), - corev1.ResourceCPU: resource.MustParse("250m"), + corev1.ResourceCPU: resource.MustParse("25m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("128Mi"), - corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceCPU: resource.MustParse("10m"), }, }, EnvFrom: []corev1.EnvFromSource{ @@ -683,11 +683,11 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("256Mi"), - corev1.ResourceCPU: resource.MustParse("250m"), + corev1.ResourceCPU: resource.MustParse("25m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("128Mi"), - corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceCPU: resource.MustParse("10m"), }, }, EnvFrom: []corev1.EnvFromSource{ diff --git a/internal/etos/suitestarter/suitestarter.go b/internal/etos/suitestarter/suitestarter.go index 0b87f7cc..4dbafc6f 100644 --- a/internal/etos/suitestarter/suitestarter.go +++ b/internal/etos/suitestarter/suitestarter.go @@ -547,11 +547,11 @@ func (r *ETOSSuiteStarterDeployment) container(name types.NamespacedName, secret Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("256Mi"), - corev1.ResourceCPU: resource.MustParse("200m"), + corev1.ResourceCPU: resource.MustParse("20m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("128Mi"), - corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceCPU: resource.MustParse("10m"), }, }, EnvFrom: []corev1.EnvFromSource{ @@ -604,10 +604,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "32Mi" - cpu: "100m" + cpu: "5m" limits: memory: "64Mi" - cpu: "250m" + cpu: "10m" volumeMounts: - mountPath: /kubexit name: kubexit @@ -617,10 +617,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "128Mi" - cpu: "100m" + cpu: "5m" limits: memory: "256Mi" - cpu: "250m" + cpu: "10m" envFrom: - secretRef: name: {etos_configmap} @@ -639,10 +639,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "150Mi" - cpu: "100m" + cpu: "10m" limits: memory: "300Mi" - cpu: "250m" + cpu: "25m" envFrom: - secretRef: name: {etos_configmap} @@ -674,10 +674,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.Name resources: requests: memory: "128Mi" - cpu: "100m" + cpu: "10m" limits: memory: "256Mi" - cpu: "250m" + cpu: "25m" envFrom: - secretRef: name: {etos_configmap} From 94d9523afbe388702d896ff8f5d1622cdb6082ab Mon Sep 17 00:00:00 2001 From: Andrei Matveyeu Date: Tue, 25 Mar 2025 14:36:03 +0100 Subject: [PATCH 2/3] suite-starter limits restored Change-Id: I829be683004a93ce94b696cb35b30605d171e4df --- internal/etos/suitestarter/suitestarter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/etos/suitestarter/suitestarter.go b/internal/etos/suitestarter/suitestarter.go index 4dbafc6f..c8282006 100644 --- a/internal/etos/suitestarter/suitestarter.go +++ b/internal/etos/suitestarter/suitestarter.go @@ -547,11 +547,11 @@ func (r *ETOSSuiteStarterDeployment) container(name types.NamespacedName, secret Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("256Mi"), - corev1.ResourceCPU: resource.MustParse("20m"), + corev1.ResourceCPU: resource.MustParse("200m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("128Mi"), - corev1.ResourceCPU: resource.MustParse("10m"), + corev1.ResourceCPU: resource.MustParse("100m"), }, }, EnvFrom: []corev1.EnvFromSource{ From d8fcfe0bead8e5c92f11be6a434aba96e8e3013f Mon Sep 17 00:00:00 2001 From: Andrei Matveyeu Date: Tue, 25 Mar 2025 14:58:18 +0100 Subject: [PATCH 3/3] limit updates Change-Id: Icaa04bce600a83d43a2a2fa7b98b40a64a2dde0a --- internal/controller/testrun_controller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/controller/testrun_controller.go b/internal/controller/testrun_controller.go index 0000ff29..9cc7f492 100644 --- a/internal/controller/testrun_controller.go +++ b/internal/controller/testrun_controller.go @@ -561,11 +561,11 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("64Mi"), - corev1.ResourceCPU: resource.MustParse("250m"), + corev1.ResourceCPU: resource.MustParse("10m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("32Mi"), - corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceCPU: resource.MustParse("5m"), }, }, VolumeMounts: []corev1.VolumeMount{ @@ -583,11 +583,11 @@ func (r TestRunReconciler) suiteRunnerJob(testrun *etosv1alpha1.TestRun) *batchv Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("256Mi"), - corev1.ResourceCPU: resource.MustParse("250m"), + corev1.ResourceCPU: resource.MustParse("10m"), }, Requests: corev1.ResourceList{ corev1.ResourceMemory: resource.MustParse("128Mi"), - corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceCPU: resource.MustParse("5m"), }, }, EnvFrom: []corev1.EnvFromSource{