Skip to content

OLS-3402: remove default resource limits on deployments #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raptorsun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OLS-3402: remove default resource limits on deployments #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions internal/controller/alertsadapter/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
},
},
)
}
Expand Down
4 changes: 0 additions & 4 deletions internal/controller/appserver/assets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
}))
Expand All @@ -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{},
}))
Expand Down Expand Up @@ -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{},
}))
Expand Down Expand Up @@ -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{},
}))
Expand Down
3 changes: 0 additions & 3 deletions internal/controller/appserver/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
},
Expand All @@ -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{},
},
Expand All @@ -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{},
},
Expand Down
1 change: 0 additions & 1 deletion internal/controller/console/assets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 0 additions & 3 deletions internal/controller/postgres/assets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 0 additions & 3 deletions internal/controller/postgres/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/utils/console_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
})
})

Expand Down
3 changes: 0 additions & 3 deletions internal/controller/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
}
}
Expand Down