Skip to content

Commit 3e1886d

Browse files
author
Jelle Dijkstra
committed
Fixed tests
1 parent 35e800e commit 3e1886d

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

internal/controller/mapserver/deployment.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ 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{},
221222
Requests: v1.ResourceList{
222223
v1.ResourceCPU: resource.MustParse("0.15"),
223224
},

internal/controller/wfs_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ var _ = Describe("WFS Controller", func() {
241241
Expect(container.Ports[0].ContainerPort).Should(Equal(int32(80)))
242242
Expect(container.Image).Should(Equal(reconcilerImages.MapserverImage))
243243
Expect(container.ImagePullPolicy).Should(Equal(v1.PullIfNotPresent))
244-
Expect(container.Resources.Limits.Memory().String()).Should(Equal("800M"))
244+
Expect(container.Resources.Limits.Memory().String()).Should(Equal("12M"))
245245
Expect(container.Resources.Requests.Cpu().String()).Should(Equal("150m"))
246246
Expect(len(container.LivenessProbe.Exec.Command)).Should(Equal(3))
247247
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'"))

internal/controller/wms_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ var _ = Describe("WMS Controller", func() {
237237
Expect(containerMapserver.Ports[0].ContainerPort).Should(Equal(int32(80)))
238238
Expect(containerMapserver.Image).Should(Equal(reconcilerImages.MapserverImage))
239239
Expect(containerMapserver.ImagePullPolicy).Should(Equal(corev1.PullIfNotPresent))
240-
Expect(containerMapserver.Resources.Limits.Memory().String()).Should(Equal("800M"))
240+
Expect(containerMapserver.Resources.Limits.Memory().String()).Should(Equal("12M"))
241241
Expect(containerMapserver.Resources.Requests.Cpu().String()).Should(Equal("100m"))
242242
Expect(len(containerMapserver.LivenessProbe.Exec.Command)).Should(Equal(3))
243243
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'"))

0 commit comments

Comments
 (0)