Skip to content

Commit 35e800e

Browse files
author
Jelle Dijkstra
committed
Fixed memory limit
1 parent 88992c4 commit 35e800e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

internal/controller/mapserver/deployment.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
218218
// Resources for mapserver container
219219
func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
220220
resources := v1.ResourceRequirements{
221-
Limits: v1.ResourceList{
222-
v1.ResourceMemory: resource.MustParse("800M"),
223-
},
224221
Requests: v1.ResourceList{
225222
v1.ResourceCPU: resource.MustParse("0.15"),
226223
},
@@ -251,8 +248,16 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
251248
resources.Limits[v1.ResourceCPU] = *objResources.Limits.Cpu()
252249
}
253250

254-
if objResources.Requests.Memory() != nil && !objResources.Requests.Memory().IsZero() {
255-
resources.Requests[v1.ResourceMemory] = *objResources.Requests.Memory()
251+
memoryRequest := objResources.Requests.Memory()
252+
if memoryRequest != nil && !memoryRequest.IsZero() {
253+
resources.Requests[v1.ResourceMemory] = *memoryRequest
254+
}
255+
256+
limitMemory := objResources.Limits.Memory()
257+
if limitMemory != nil && !limitMemory.IsZero() {
258+
resources.Limits[v1.ResourceMemory] = *limitMemory
259+
} else {
260+
resources.Limits[v1.ResourceMemory] = resource.MustParse("800M")
256261
}
257262

258263
if use, _ := mapperutils.UseEphemeralVolume(obj); !use {

0 commit comments

Comments
 (0)