From 6dec63189fa73370973437b0a4ee890dcc8d0869 Mon Sep 17 00:00:00 2001 From: Sergey Smolnikov Date: Fri, 3 Jan 2025 14:34:40 +0100 Subject: [PATCH 1/2] Extended job aux resource --- charts/radix-operator/Chart.yaml | 4 ++-- pkg/apis/deployment/kubedeployment.go | 2 +- pkg/apis/deployment/kubedeployment_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml index eb740213c..f11a12a64 100644 --- a/charts/radix-operator/Chart.yaml +++ b/charts/radix-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: radix-operator -version: 1.48.2 -appVersion: 1.68.2 +version: 1.48.3 +appVersion: 1.68.3 kubeVersion: ">=1.24.0" description: Radix Operator keywords: diff --git a/pkg/apis/deployment/kubedeployment.go b/pkg/apis/deployment/kubedeployment.go index df5cb5df4..3b7e329ce 100644 --- a/pkg/apis/deployment/kubedeployment.go +++ b/pkg/apis/deployment/kubedeployment.go @@ -151,7 +151,7 @@ func (deploy *Deployment) createJobAuxDeployment(deployComponent v1.RadixCommonD Spec: corev1.PodSpec{Containers: []corev1.Container{ { Name: jobAuxDeploymentName, - Resources: resources.New(resources.WithCPUMilli(1), resources.WithMemoryMega(10)), + Resources: resources.New(resources.WithCPUMilli(1), resources.WithMemoryMega(20)), }}, }, }, diff --git a/pkg/apis/deployment/kubedeployment_test.go b/pkg/apis/deployment/kubedeployment_test.go index 54c694fa2..2d3d31cca 100644 --- a/pkg/apis/deployment/kubedeployment_test.go +++ b/pkg/apis/deployment/kubedeployment_test.go @@ -263,7 +263,7 @@ func TestDeployment_createJobAuxDeployment(t *testing.T) { resources := jobAuxDeployment.Spec.Template.Spec.Containers[0].Resources s := resources.Requests.Cpu().String() assert.Equal(t, "1m", s) - assert.Equal(t, "10M", resources.Requests.Memory().String()) + assert.Equal(t, "20M", resources.Requests.Memory().String()) assert.Equal(t, "0", resources.Limits.Cpu().String()) - assert.Equal(t, "10M", resources.Limits.Memory().String()) + assert.Equal(t, "20M", resources.Limits.Memory().String()) } From 8a9d402ffd48349dbd70f58084bf27c264121a72 Mon Sep 17 00:00:00 2001 From: Sergey Smolnikov Date: Fri, 3 Jan 2025 14:59:15 +0100 Subject: [PATCH 2/2] Extended job aux resource --- pkg/apis/deployment/deployment.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/apis/deployment/deployment.go b/pkg/apis/deployment/deployment.go index 8d40130da..e571532f7 100644 --- a/pkg/apis/deployment/deployment.go +++ b/pkg/apis/deployment/deployment.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/equinor/radix-operator/pkg/apis/utils/resources" "sort" "strings" "time" @@ -639,7 +640,9 @@ func (deploy *Deployment) getCurrentAndDesiredJobAuxDeployment(ctx context.Conte } return nil, nil, err } - return currentJobAuxDeployment, currentJobAuxDeployment.DeepCopy(), nil + desiredJobAuxDeployment := currentJobAuxDeployment.DeepCopy() + desiredJobAuxDeployment.Spec.Template.Spec.Containers[0].Resources = resources.New(resources.WithCPUMilli(1), resources.WithMemoryMega(20)) + return currentJobAuxDeployment, desiredJobAuxDeployment, nil } func getJobAuxObjectName(jobName string) string {