Skip to content

Jd/memory limit #37

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

Merged
jelledijkstra97 merged 4 commits into from
May 14, 2025
Merged

Jd/memory limit #37

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35e800e
Fixed memory limit
May 13, 2025
3e1886d
Fixed tests
May 13, 2025
4c9414b
Changed var name
May 13, 2025
3ef4440
Set max of request and limit as limit
May 13, 2025
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
16 changes: 11 additions & 5 deletions internal/controller/mapserver/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,7 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
// Resources for mapserver container
func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
resources := v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceMemory: resource.MustParse("800M"),
},
Limits: v1.ResourceList{},
Requests: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("0.15"),
},
Expand Down Expand Up @@ -251,8 +249,16 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
resources.Limits[v1.ResourceCPU] = *objResources.Limits.Cpu()
}

if objResources.Requests.Memory() != nil && !objResources.Requests.Memory().IsZero() {
resources.Requests[v1.ResourceMemory] = *objResources.Requests.Memory()
memoryRequest := objResources.Requests.Memory()
if memoryRequest != nil && !memoryRequest.IsZero() {
resources.Requests[v1.ResourceMemory] = *memoryRequest
}

memoryLimit := objResources.Limits.Memory()
if memoryLimit != nil && !memoryLimit.IsZero() {
resources.Limits[v1.ResourceMemory] = *memoryLimit
} else {
resources.Limits[v1.ResourceMemory] = resource.MustParse("800M")
}

if use, _ := mapperutils.UseEphemeralVolume(obj); !use {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/wfs_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ var _ = Describe("WFS Controller", func() {
Expect(container.Ports[0].ContainerPort).Should(Equal(int32(80)))
Expect(container.Image).Should(Equal(reconcilerImages.MapserverImage))
Expect(container.ImagePullPolicy).Should(Equal(v1.PullIfNotPresent))
Expect(container.Resources.Limits.Memory().String()).Should(Equal("800M"))
Expect(container.Resources.Limits.Memory().String()).Should(Equal("12M"))
Expect(container.Resources.Requests.Cpu().String()).Should(Equal("150m"))
Expect(len(container.LivenessProbe.Exec.Command)).Should(Equal(3))
Expect(container.LivenessProbe.Exec.Command[2]).Should(Equal("wget -SO- -T 10 -t 2 'http://127.0.0.1:80/mapserver?SERVICE=wfs&request=GetCapabilities' 2>&1 | egrep -aiA10 'HTTP/1.1 200' | egrep -i 'Content-Type: text/xml'"))
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/wms_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ var _ = Describe("WMS Controller", func() {
Expect(containerMapserver.Ports[0].ContainerPort).Should(Equal(int32(80)))
Expect(containerMapserver.Image).Should(Equal(reconcilerImages.MapserverImage))
Expect(containerMapserver.ImagePullPolicy).Should(Equal(corev1.PullIfNotPresent))
Expect(containerMapserver.Resources.Limits.Memory().String()).Should(Equal("800M"))
Expect(containerMapserver.Resources.Limits.Memory().String()).Should(Equal("12M"))
Expect(containerMapserver.Resources.Requests.Cpu().String()).Should(Equal("100m"))
Expect(len(containerMapserver.LivenessProbe.Exec.Command)).Should(Equal(3))
Expect(containerMapserver.LivenessProbe.Exec.Command[2]).Should(Equal("wget -SO- -T 10 -t 2 'http://127.0.0.1:80/mapserver?SERVICE=wms&request=GetCapabilities' 2>&1 | egrep -aiA10 'HTTP/1.1 200' | egrep -i 'Content-Type: text/xml'"))
Expand Down
Loading