Pdok 17793 Added several tests to mimic molecule tests

api/v2beta1/shared_conversion.go

@@ -79,11 +79,20 @@ func ConvertAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerS
 }
 
 func ConvertResources(src corev1.ResourceRequirements) *corev1.PodSpec {
+	targetResources := src
+
+	if src.Requests != nil {
+		targetResources.Requests[corev1.ResourceEphemeralStorage] = src.Requests["ephemeralStorage"]
+	}
+	if src.Limits != nil {
+		targetResources.Limits[corev1.ResourceEphemeralStorage] = src.Limits["ephemeralStorage"]
+	}
+
 	return &corev1.PodSpec{
 		Containers: []corev1.Container{
 			{
 				Name:      "mapserver",
-				Resources: src,
+				Resources: targetResources,
 			},
 		},
 	}

internal/controller/mapperutils/utils.go

@@ -33,10 +33,13 @@ func ephemeralStorage[O pdoknlv3.WMSWFS](obj O, limit bool) *resource.Quantity {
 	for _, container := range obj.PodSpecPatch().Containers {
 		if container.Name == "mapserver" {
 			if limit {
-				return container.Resources.Limits.StorageEphemeral()
+				limitVal := container.Resources.Limits.StorageEphemeral()
+				if !limitVal.IsZero() {
+					return limitVal
+				}
+			} else if !container.Resources.Requests.StorageEphemeral().IsZero() {
+				return container.Resources.Requests.StorageEphemeral()
 			}
-
-			return container.Resources.Requests.StorageEphemeral()
 		}
 	}
 

internal/controller/mapserver/deployment.go

@@ -217,6 +217,7 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
 	}
 }
 
+// Resources for mapserver container
 func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
 	minimumEphemeralStorageLimit := resource.MustParse("200M")
 	resources := v1.ResourceRequirements{
@@ -230,8 +231,20 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
 	}
 
 	objResources := &v1.ResourceRequirements{}
-	if obj.PodSpecPatch() != nil && obj.PodSpecPatch().Resources != nil {
-		objResources = obj.PodSpecPatch().Resources
+	if obj.PodSpecPatch() != nil {
+		found := false
+		for _, container := range obj.PodSpecPatch().Containers {
+			if container.Name == "mapserver" {
+				objResources = &container.Resources
+				found = true
+				break
+			}
+		}
+
+		if !found && obj.PodSpecPatch().Resources != nil {
+			objResources = obj.PodSpecPatch().Resources
+		}
+
 	}
 
 	if obj.Type() == pdoknlv3.ServiceTypeWMS && obj.Options().UseWebserviceProxy() {
@@ -242,14 +255,14 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
 		resources.Limits[v1.ResourceCPU] = *objResources.Limits.Cpu()
 	}
 
-	if objResources.Requests.Memory() != nil {
+	if objResources.Requests.Memory() != nil && !objResources.Requests.Memory().IsZero() {
 		resources.Requests[v1.ResourceMemory] = *objResources.Requests.Memory()
 	}
 
 	if use, _ := mapperutils.UseEphemeralVolume(obj); !use {
 		value := mapperutils.EphemeralStorageLimit(obj)
 
-		if value.Value() > minimumEphemeralStorageLimit.Value() {
+		if objResources.Limits.StorageEphemeral() != nil && objResources.Limits.StorageEphemeral().Value() > minimumEphemeralStorageLimit.Value() {
 			resources.Limits[v1.ResourceEphemeralStorage] = *value
 		}
 	}

internal/controller/mapserver/deployment_test.go

@@ -0,0 +1,122 @@
+package mapserver
+
+import (
+	"encoding/json"
+	"github.com/pdok/mapserver-operator/api/v2beta1"
+	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
+	"github.com/pdok/mapserver-operator/internal/controller/types"
+	"github.com/stretchr/testify/assert"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"sigs.k8s.io/yaml"
+	"testing"
+)
+
+const (
+	v2WfsString                  = "apiVersion: pdok.nl/v2beta1\nkind: WFS\nmetadata:\n  name: rws-nwbwegen-v1-0\n  labels:\n    dataset-owner: rws\n    dataset: nwbwegen\n    service-version: v1_0\n    service-type: wfs\n  annotations:\n    lifecycle-phase: prod\n    service-bundle-id: b39c152b-393b-52f5-a50c-e1ffe904b6fb\nspec:\n  general:\n    datasetOwner: rws\n    dataset: nwbwegen\n    serviceVersion: v1_0\n  kubernetes:\n    healthCheck:\n      mimetype: text/xml\n      querystring: SERVICE=WFS&VERSION=2.0.0&REQUEST=GetCapabilities\n    resources:\n      limits:\n        ephemeralStorage: 1505Mi\n      requests:\n        ephemeralStorage: 1505Mi\n  service:\n    title: NWB - Wegen WFS\n    abstract:\n      Dit is de web feature service van het Nationaal Wegen Bestand (NWB)\n      - wegen. Deze dataset bevat alleen de wegvakken en hectometerpunten. Het Nationaal\n      Wegen Bestand - Wegen is een digitaal geografisch bestand van alle wegen in\n      Nederland. Opgenomen zijn alle wegen die worden beheerd door wegbeheerders als\n      het Rijk, provincies, gemeenten en waterschappen, echter alleen voor zover deze\n      zijn voorzien van een straatnaam of nummer.\n    inspire: true\n    metadataIdentifier: a9fa7fff-6365-4885-950c-e9d9848359ee\n    authority:\n      name: rws\n      url: https://www.rijkswaterstaat.nl\n    dataEPSG: EPSG:28992\n    extent: -59188.44333693248 304984.64144318487 308126.88473339565 858328.516489961\n    keywords:\n      - Vervoersnetwerken\n      - Menselijke gezondheid en veiligheid\n      - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n      - Nationaal\n      - Voertuigen\n      - Verkeer\n      - Wegvakken\n      - Hectometerpunten\n      - HVD\n      - Mobiliteit\n    featureTypes:\n      - name: wegvakken\n        title: Wegvakken\n        abstract:\n          Dit featuretype bevat de wegvakken uit het Nationaal Wegen bestand\n          (NWB) en bevat gedetailleerde informatie per wegvak zoals straatnaam, wegnummer,\n          routenummer, wegbeheerder, huisnummers, enz.\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Wegvakken\n        data:\n          gpkg:\n            table: wegvakken\n            geometryType: MultiLineString\n            blobKey: geopackages/rws/nwbwegen/1c56dc48-2cf4-4631-8b09-ed385d5368d1/1/nwb_wegen.gpkg\n            columns:\n              - fid\n              - objectid\n              - wvk_id\n              - wvk_begdat\n              - jte_id_beg\n              - jte_id_end\n              - wegbehsrt\n              - wegnummer\n              - wegdeelltr\n              - hecto_lttr\n              - bst_code\n              - rpe_code\n              - admrichtng\n              - rijrichtng\n              - stt_naam\n              - stt_bron\n              - wpsnaam\n              - gme_id\n              - gme_naam\n              - hnrstrlnks\n              - hnrstrrhts\n              - e_hnr_lnks\n              - e_hnr_rhts\n              - l_hnr_lnks\n              - l_hnr_rhts\n              - begafstand\n              - endafstand\n              - beginkm\n              - eindkm\n              - pos_tv_wol\n              - wegbehcode\n              - wegbehnaam\n              - distrcode\n              - distrnaam\n              - dienstcode\n              - dienstnaam\n              - wegtype\n              - wgtype_oms\n              - routeltr\n              - routenr\n              - routeltr2\n              - routenr2\n              - routeltr3\n              - routenr3\n              - routeltr4\n              - routenr4\n              - wegnr_aw\n              - wegnr_hmp\n              - geobron_id\n              - geobron_nm\n              - bronjaar\n              - openlr\n              - bag_orl\n              - frc\n              - fow\n              - alt_naam\n              - alt_nr\n              - rel_hoogte\n              - st_lengthshape\n      - name: hectopunten\n        title: Hectopunten\n        abstract:\n          Dit featuretype bevat de hectopunten uit het Nationaal Wegen Bestand\n          (NWB) en bevat gedetailleerde informatie per hectopunt zoals hectometrering,\n          afstand, zijde en hectoletter.\n        sourceMetadataIdentifier: 8f0497f0-dbd7-4bee-b85a-5fdec484a7ff\n        datasetMetadataIdentifier: a9b7026e-0a81-4813-93bd-ba49e6f28502\n        keywords:\n          - Vervoersnetwerken\n          - Menselijke gezondheid en veiligheid\n          - Geluidsbelasting hoofdwegen (Richtlijn Omgevingslawaai)\n          - Nationaal\n          - Voertuigen\n          - Verkeer\n          - Hectometerpunten\n        data:\n          gpkg:\n            blobKey: geopackages/rws/nwbwegen/1c56dc48-2cf4-4631-8b09-ed385d5368d1/1/nwb_wegen.gpkg\n            columns:\n              - fid\n              - objectid\n              - hectomtrng\n              - afstand\n              - wvk_id\n              - wvk_begdat\n              - zijde\n              - hecto_lttr\n            geometryType: MultiPoint\n            table: hectopunten\n"
+	expectedVolumeMountsString   = "[{\"name\":\"base\",\"mountPath\":\"/srv/data\"},{\"name\":\"data\",\"mountPath\":\"/var/www\"},{\"name\":\"mapserver\",\"mountPath\":\"/srv/mapserver/config/default_mapserver.conf\",\"subPath\":\"default_mapserver.conf\"},{\"name\":\"mapserver\",\"mountPath\":\"/srv/mapserver/config/include.conf\",\"subPath\":\"include.conf\"},{\"name\":\"mapserver\",\"mountPath\":\"/srv/mapserver/config/ogc.lua\",\"subPath\":\"ogc.lua\"},{\"name\":\"mapserver\",\"mountPath\":\"/srv/mapserver/config/scraping-error.xml\",\"subPath\":\"scraping-error.xml\"}]"
+	expectedEnvVarsString        = "[{\"name\":\"SERVICE_TYPE\",\"value\":\"WFS\"},{\"name\":\"MAPSERVER_CONFIG_FILE\",\"value\":\"/srv/mapserver/config/default_mapserver.conf\"},{\"name\":\"AZURE_STORAGE_CONNECTION_STRING\",\"valueFrom\":{\"secretKeyRef\":{\"name\":\"blobs-secret\",\"key\":\"AZURE_STORAGE_CONNECTION_STRING\"}}},{\"name\":\"MS_MAPFILE\",\"value\":\"/srv/data/config/mapfile/service.map\"}]\n"
+	expectedLivenessProbeString  = "{\"exec\":{\"command\":[\"/bin/sh\",\"-c\",\"wget -SO- -T 10 -t 2 'http://127.0.0.1:80/mapserver?SERVICE=wfs\\u0026request=GetCapabilities' 2\\u003e\\u00261 | egrep -aiA10 'HTTP/1.1 200' | egrep -i 'Content-Type: text/xml'\"]},\"initialDelaySeconds\":20,\"timeoutSeconds\":10,\"periodSeconds\":10,\"successThreshold\":1,\"failureThreshold\":3}\n"
+	expectedReadinessProbeString = "{\"exec\":{\"command\":[\"/bin/sh\",\"-c\",\"wget -SO- -T 10 -t 2 'http://127.0.0.1:80/mapserver?SERVICE=WFS\\u0026VERSION=2.0.0\\u0026REQUEST=GetFeature\\u0026TYPENAMES=wegvakken\\u0026STARTINDEX=0\\u0026COUNT=1' 2\\u003e\\u00261 | egrep -aiA10 'HTTP/1.1 200' | egrep -i 'Content-Type: text/xml'\"]},\"initialDelaySeconds\":20,\"timeoutSeconds\":10,\"periodSeconds\":10,\"successThreshold\":1,\"failureThreshold\":3}\n"
+	expectedStartupProbeString   = "{\"exec\":{\"command\":[\"/bin/sh\",\"-c\",\"wget -SO- -T 10 -t 2 'http://127.0.0.1:80/mapserver?SERVICE=WFS\\u0026VERSION=2.0.0\\u0026REQUEST=GetFeature\\u0026TYPENAMES=wegvakken,hectopunten\\u0026STARTINDEX=0\\u0026COUNT=1' 2\\u003e\\u00261 | egrep -aiA10 'HTTP/1.1 200' | egrep -i 'Content-Type: text/xml'\"]},\"initialDelaySeconds\":20,\"timeoutSeconds\":10,\"periodSeconds\":10,\"successThreshold\":1,\"failureThreshold\":3}\n"
+)
+
+func TestGetVolumeMountsForDeployment(t *testing.T) {
+	var wfs = getV3()
+	pdoknlv3.SetHost("https://service.pdok.nl")
+	result := GetVolumeMountsForDeployment(wfs, "/srv")
+
+	var expectedVolumeMounts []v1.VolumeMount
+	err := json.Unmarshal([]byte(expectedVolumeMountsString), &expectedVolumeMounts)
+	assert.NoError(t, err)
+	assert.Equal(t, expectedVolumeMounts, result)
+}
+
+func TestGetEnvVarsForDeployment(t *testing.T) {
+	var wfs = getV3()
+	pdoknlv3.SetHost("https://service.pdok.nl")
+	result := GetEnvVarsForDeployment(wfs, "blobs-secret")
+	var expectedEnvVars []v1.EnvVar
+	err := json.Unmarshal([]byte(expectedEnvVarsString), &expectedEnvVars)
+	assert.NoError(t, err)
+	assert.Equal(t, expectedEnvVars, result)
+}
+
+func TestGetResourcesForDeployment(t *testing.T) {
+	var wfs = getV3()
+	pdoknlv3.SetHost("https://service.pdok.nl")
+	result := GetResourcesForDeployment(wfs)
+
+	expectedLimits := v1.ResourceList{}
+	expectedRequest := v1.ResourceList{}
+
+	expectedLimits[v1.ResourceMemory] = resource.MustParse("800M")
+	expectedLimits[v1.ResourceEphemeralStorage] = resource.MustParse("1505Mi")
+
+	expectedRequest[v1.ResourceCPU] = resource.MustParse("0.15")
+	expectedRequest[v1.ResourceEphemeralStorage] = resource.MustParse("1505Mi")
+
+	var expected = v1.ResourceRequirements{
+		Limits:   expectedLimits,
+		Requests: expectedRequest,
+		Claims:   nil,
+	}
+
+	assert.Equal(t, expected, result)
+}
+
+func TestGetProbesForDeployment(t *testing.T) {
+	var wfs = getV3()
+	pdoknlv3.SetHost("https://service.pdok.nl")
+	livenessResult, readinessResult, startupResult, err := GetProbesForDeployment(wfs)
+	assert.NoError(t, err)
+	var expectedLiveness v1.Probe
+	var expectedReadiness v1.Probe
+	var expectedStartup v1.Probe
+	err = json.Unmarshal([]byte(expectedLivenessProbeString), &expectedLiveness)
+	assert.NoError(t, err)
+	err = json.Unmarshal([]byte(expectedReadinessProbeString), &expectedReadiness)
+	assert.NoError(t, err)
+	err = json.Unmarshal([]byte(expectedStartupProbeString), &expectedStartup)
+	assert.NoError(t, err)
+	assert.Equal(t, &expectedLiveness, livenessResult)
+	assert.Equal(t, &expectedReadiness, readinessResult)
+	assert.Equal(t, &expectedStartup, startupResult)
+}
+
+func TestGetVolumesForDeployment(t *testing.T) {
+	var wfs = getV3()
+	pdoknlv3.SetHost("https://service.pdok.nl")
+
+	hashedConfigMapNames := types.HashedConfigMapNames{
+		ConfigMap:             "rws-nwbwegen-v1-0-wfs-mapserver-bb59c7f4f4",
+		BlobDownload:          "2",
+		MapfileGenerator:      "rws-nwbwegen-v1-0-wfs-mapfile-generator-bbbtd999dh",
+		CapabilitiesGenerator: "rws-nwbwegen-v1-0-wfs-capabilities-generator-6m4mfkgb5d",
+		OgcWebserviceProxy:    "3",
+		LegendGenerator:       "4",
+		FeatureInfoGenerator:  "5",
+	}
+	result := GetVolumesForDeployment(wfs, hashedConfigMapNames)
+
+	expected := []v1.Volume{
+		{Name: "base", VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}},
+		{Name: "data", VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}},
+		{Name: "mapserver", VolumeSource: v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "rws-nwbwegen-v1-0-wfs-mapserver-bb59c7f4f4"}, DefaultMode: v2beta1.Pointer(int32(420))}}},
+		{Name: "mapfile-generator-config", VolumeSource: v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "rws-nwbwegen-v1-0-wfs-mapfile-generator-bbbtd999dh"}, DefaultMode: v2beta1.Pointer(int32(420))}}},
+		{Name: "capabilities-generator-config", VolumeSource: v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "rws-nwbwegen-v1-0-wfs-capabilities-generator-6m4mfkgb5d"}, DefaultMode: v2beta1.Pointer(int32(420))}}},
+	}
+
+	assert.Equal(t, expected, result)
+}
+
+func getV3() *pdoknlv3.WFS {
+	var v2wfs v2beta1.WFS
+	err := yaml.Unmarshal([]byte(v2WfsString), &v2wfs)
+	if err != nil {
+		panic(err)
+	}
+	var wfs pdoknlv3.WFS
+	v2wfs.ToV3(&wfs)
+	return &wfs
+}