From eee107c88e8956ca2cf95e0e2593aba70023cb0a Mon Sep 17 00:00:00 2001 From: Haoyu Sun Date: Fri, 3 Jul 2026 16:02:19 +0200 Subject: [PATCH] OLS-3402: remove default resource limits on deployments Signed-off-by: Haoyu Sun --- internal/controller/alertsadapter/deployment.go | 3 --- internal/controller/appserver/assets_test.go | 4 ---- internal/controller/appserver/deployment.go | 3 --- internal/controller/console/assets_test.go | 1 - internal/controller/postgres/assets_test.go | 3 --- internal/controller/postgres/deployment.go | 3 --- internal/controller/utils/console_plugin_test.go | 2 +- internal/controller/utils/utils.go | 3 --- 8 files changed, 1 insertion(+), 21 deletions(-) diff --git a/internal/controller/alertsadapter/deployment.go b/internal/controller/alertsadapter/deployment.go index 649ccf78e..56dc74666 100644 --- a/internal/controller/alertsadapter/deployment.go +++ b/internal/controller/alertsadapter/deployment.go @@ -23,9 +23,6 @@ func getAlertsAdapterResources(cr *olsv1alpha1.OLSConfig) *corev1.ResourceRequir corev1.ResourceCPU: resource.MustParse("10m"), corev1.ResourceMemory: resource.MustParse("50Mi"), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("100Mi"), - }, }, ) } diff --git a/internal/controller/appserver/assets_test.go b/internal/controller/appserver/assets_test.go index 3d019da52..f734d110e 100644 --- a/internal/controller/appserver/assets_test.go +++ b/internal/controller/appserver/assets_test.go @@ -805,7 +805,6 @@ var _ = Describe("App server assets", func() { })) Expect(dep.Spec.Template.Spec.Containers[0].VolumeMounts).To(ConsistOf(get10RequiredVolumeMounts())) Expect(dep.Spec.Template.Spec.Containers[0].Resources).To(Equal(corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("4Gi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("500m"), corev1.ResourceMemory: resource.MustParse("1Gi")}, Claims: []corev1.ResourceClaim{}, })) @@ -825,7 +824,6 @@ var _ = Describe("App server assets", func() { })) Expect(dep.Spec.Template.Spec.Containers[1].VolumeMounts).To(ConsistOf(get10RequiredVolumeMounts())) Expect(dep.Spec.Template.Spec.Containers[1].Resources).To(Equal(corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("200Mi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("50m"), corev1.ResourceMemory: resource.MustParse("64Mi")}, Claims: []corev1.ResourceClaim{}, })) @@ -1322,7 +1320,6 @@ var _ = Describe("App server assets", func() { })) Expect(openshiftMCPServerContainer.SecurityContext).To(Equal(utils.RestrictedContainerSecurityContext())) Expect(openshiftMCPServerContainer.Resources).To(Equal(corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("200Mi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("50m"), corev1.ResourceMemory: resource.MustParse("64Mi")}, Claims: []corev1.ResourceClaim{}, })) @@ -1426,7 +1423,6 @@ var _ = Describe("App server assets", func() { "--port", fmt.Sprintf("%d", utils.OpenShiftMCPServerPort), })) Expect(mcpContainer.Resources).To(Equal(corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("200Mi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("50m"), corev1.ResourceMemory: resource.MustParse("64Mi")}, Claims: []corev1.ResourceClaim{}, })) diff --git a/internal/controller/appserver/deployment.go b/internal/controller/appserver/deployment.go index 9a51e52e5..783d664d3 100644 --- a/internal/controller/appserver/deployment.go +++ b/internal/controller/appserver/deployment.go @@ -27,7 +27,6 @@ func getOLSServerResources(cr *olsv1alpha1.OLSConfig) *corev1.ResourceRequiremen return utils.GetResourcesOrDefault( cr.Spec.OLSConfig.DeploymentConfig.APIContainer.Resources, &corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("4Gi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("500m"), corev1.ResourceMemory: resource.MustParse("1Gi")}, Claims: []corev1.ResourceClaim{}, }, @@ -38,7 +37,6 @@ func getOLSDataCollectorResources(cr *olsv1alpha1.OLSConfig) *corev1.ResourceReq return utils.GetResourcesOrDefault( cr.Spec.OLSConfig.DeploymentConfig.DataCollectorContainer.Resources, &corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("200Mi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("50m"), corev1.ResourceMemory: resource.MustParse("64Mi")}, Claims: []corev1.ResourceClaim{}, }, @@ -49,7 +47,6 @@ func getOLSMCPServerResources(cr *olsv1alpha1.OLSConfig) *corev1.ResourceRequire return utils.GetResourcesOrDefault( cr.Spec.OLSConfig.DeploymentConfig.MCPServerContainer.Resources, &corev1.ResourceRequirements{ - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("200Mi")}, Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("50m"), corev1.ResourceMemory: resource.MustParse("64Mi")}, Claims: []corev1.ResourceClaim{}, }, diff --git a/internal/controller/console/assets_test.go b/internal/controller/console/assets_test.go index d64ce5fad..d39990f25 100644 --- a/internal/controller/console/assets_test.go +++ b/internal/controller/console/assets_test.go @@ -61,7 +61,6 @@ var _ = Describe("Console UI assets", func() { Expect(dep.Spec.Template.Spec.Containers[0].Ports[0].Protocol).To(Equal(corev1.ProtocolTCP)) Expect(dep.Spec.Template.Spec.Containers[0].Resources).To(Equal(corev1.ResourceRequirements{ Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("10m"), corev1.ResourceMemory: resource.MustParse("50Mi")}, - Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("100Mi")}, Claims: []corev1.ResourceClaim{}, })) Expect(dep.Spec.Template.Spec.Containers[0].Env).To(ContainElement(corev1.EnvVar{ diff --git a/internal/controller/postgres/assets_test.go b/internal/controller/postgres/assets_test.go index a26866cd5..bf98271ed 100644 --- a/internal/controller/postgres/assets_test.go +++ b/internal/controller/postgres/assets_test.go @@ -46,9 +46,6 @@ var _ = Describe("App postgres server assets", func() { corev1.ResourceCPU: resource.MustParse("30m"), corev1.ResourceMemory: resource.MustParse("300Mi"), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("2Gi"), - }, })) expectedSecretRef := &corev1.EnvVarSource{ SecretKeyRef: &corev1.SecretKeySelector{ diff --git a/internal/controller/postgres/deployment.go b/internal/controller/postgres/deployment.go index fcc2e5351..a09b0b629 100644 --- a/internal/controller/postgres/deployment.go +++ b/internal/controller/postgres/deployment.go @@ -23,9 +23,6 @@ func getDatabaseResources(cr *olsv1alpha1.OLSConfig) *corev1.ResourceRequirement corev1.ResourceCPU: resource.MustParse("30m"), corev1.ResourceMemory: resource.MustParse("300Mi"), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("2Gi"), - }, } return utils.GetResourcesOrDefault( cr.Spec.OLSConfig.DeploymentConfig.DatabaseContainer.Resources, diff --git a/internal/controller/utils/console_plugin_test.go b/internal/controller/utils/console_plugin_test.go index 01946bc7d..76cf18d26 100644 --- a/internal/controller/utils/console_plugin_test.go +++ b/internal/controller/utils/console_plugin_test.go @@ -54,7 +54,7 @@ var _ = Describe("Console plugin shared utilities", func() { resources := DefaultConsolePluginResourceRequirements() Expect(resources.Requests[corev1.ResourceCPU]).To(Equal(resource.MustParse("10m"))) Expect(resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("50Mi"))) - Expect(resources.Limits[corev1.ResourceMemory]).To(Equal(resource.MustParse("100Mi"))) + Expect(resources.Limits).To(BeNil()) }) }) diff --git a/internal/controller/utils/utils.go b/internal/controller/utils/utils.go index 804d4d0df..91ed0444f 100644 --- a/internal/controller/utils/utils.go +++ b/internal/controller/utils/utils.go @@ -952,9 +952,6 @@ func DefaultConsolePluginResourceRequirements() *corev1.ResourceRequirements { corev1.ResourceCPU: resource.MustParse("10m"), corev1.ResourceMemory: resource.MustParse("50Mi"), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("100Mi"), - }, Claims: []corev1.ResourceClaim{}, } }