remove unneeded code/tests

Author: Shalucik

internal/controller/constants/constants.go

@@ -24,5 +24,6 @@ const (
 	ConfigMapCustomMapfileVolumeName         = "mapfile"
 
 	HTMLTemplatesPath       = "/srv/data/config/templates"
+	MapserverPortNr   int32 = 80
 	ApachePortNr      int32 = 9117
 )

internal/controller/ingressroute.go

@@ -6,8 +6,6 @@ import (
 
 	"github.com/pdok/mapserver-operator/internal/controller/constants"
 
-	"github.com/pdok/mapserver-operator/internal/controller/mapserver"
-
 	"github.com/pdok/mapserver-operator/internal/controller/utils"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -67,7 +65,7 @@ func mutateIngressRoute[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, ingressRout
 			Kind: "Service",
 			Port: intstr.IntOrString{
 				Type:   intstr.Int,
-				IntVal: mapserver.MapserverPortNr,
+				IntVal: constants.MapserverPortNr,
 			},
 		},
 	}

internal/controller/mapserver/deployment.go

@@ -9,25 +9,16 @@ import (
 	"github.com/pdok/mapserver-operator/internal/controller/utils"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
-	"github.com/pdok/mapserver-operator/internal/controller/mapperutils"
 	"github.com/pdok/mapserver-operator/internal/controller/static"
 	"github.com/pdok/mapserver-operator/internal/controller/types"
-	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 )
 
-const (
-	MapserverPortNr int32 = 80
-
-	// TODO How should we determine this boundingbox?
-	// healthCheckBbox = "190061.4619730016857,462435.5987861062749,202917.7508707302331,473761.6884966178914"
-
-	mimeTextXML = "text/xml"
-)
+const mimeTextXML = "text/xml"
 
 func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, blobsSecretName string) (*corev1.Container, error) {
-	livenessProbe, readinessProbe, startupProbe, err := GetProbesForDeployment(obj)
+	livenessProbe, readinessProbe, startupProbe, err := getProbes(obj)
 	if err != nil {
 		return nil, err
 	}
@@ -36,7 +27,7 @@ func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images, blobsS
 		Name:            constants.MapserverName,
 		Image:           images.MapserverImage,
 		ImagePullPolicy: corev1.PullIfNotPresent,
-		Ports:           []corev1.ContainerPort{{ContainerPort: MapserverPortNr, Protocol: corev1.ProtocolTCP}},
+		Ports:           []corev1.ContainerPort{{ContainerPort: constants.MapserverPortNr, Protocol: corev1.ProtocolTCP}},
 		Env: []corev1.EnvVar{
 			{
 				Name:  "SERVICE_TYPE",
@@ -100,169 +91,6 @@ func getVolumeMounts(customMapfile bool) []corev1.VolumeMount {
 	return volumeMounts
 }
 
-var storageClassName string
-
-func SetStorageClassName(name string) {
-	storageClassName = name
-}
-
-// TODO fix linting (funlen)
-//
-//nolint:funlen
-func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.HashedConfigMapNames) []corev1.Volume {
-	baseVolume := corev1.Volume{Name: constants.BaseVolumeName}
-	if use, size := mapperutils.UseEphemeralVolume(obj); use {
-		baseVolume.Ephemeral = &corev1.EphemeralVolumeSource{
-			VolumeClaimTemplate: &corev1.PersistentVolumeClaimTemplate{
-				Spec: corev1.PersistentVolumeClaimSpec{
-					AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
-					Resources: corev1.VolumeResourceRequirements{
-						Requests: corev1.ResourceList{
-							corev1.ResourceStorage: *size,
-						},
-					},
-				},
-			},
-		}
-
-		if storageClassName != "" {
-			baseVolume.Ephemeral.VolumeClaimTemplate.Spec.StorageClassName = &storageClassName
-		}
-	} else {
-		baseVolume.VolumeSource = corev1.VolumeSource{
-			EmptyDir: &corev1.EmptyDirVolumeSource{},
-		}
-	}
-
-	newVolumeSource := func(name string) corev1.VolumeSource {
-		return corev1.VolumeSource{
-			ConfigMap: &corev1.ConfigMapVolumeSource{
-				DefaultMode: smoothoperatorutils.Pointer(int32(0644)),
-				LocalObjectReference: corev1.LocalObjectReference{
-					Name: name,
-				},
-			},
-		}
-	}
-
-	volumes := []corev1.Volume{
-		baseVolume,
-		{
-			Name: constants.DataVolumeName,
-			VolumeSource: corev1.VolumeSource{
-				EmptyDir: &corev1.EmptyDirVolumeSource{},
-			},
-		},
-		{
-			Name:         constants.MapserverName,
-			VolumeSource: newVolumeSource(configMapNames.Mapserver),
-		},
-	}
-
-	if mapfile := obj.Mapfile(); mapfile != nil {
-		volumes = append(volumes, corev1.Volume{
-			Name:         constants.ConfigMapCustomMapfileVolumeName,
-			VolumeSource: newVolumeSource(mapfile.ConfigMapKeyRef.Name),
-		})
-	}
-
-	if obj.Type() == pdoknlv3.ServiceTypeWMS && obj.Options().UseWebserviceProxy() {
-		volumes = append(volumes, corev1.Volume{
-			Name:         constants.ConfigMapOgcWebserviceProxyVolumeName,
-			VolumeSource: newVolumeSource(configMapNames.OgcWebserviceProxy),
-		})
-	}
-
-	if obj.Options().PrefetchData {
-		vol := newVolumeSource(configMapNames.InitScripts)
-		vol.ConfigMap.DefaultMode = smoothoperatorutils.Pointer(int32(0777))
-		volumes = append(volumes, corev1.Volume{
-			Name:         constants.InitScriptsName,
-			VolumeSource: vol,
-		})
-	}
-
-	// Add capabilitiesgenerator config here to get the same order as the ansible operator
-	// Needed to compare deployments from the ansible operator and this one
-	volumes = append(volumes, corev1.Volume{
-		Name:         constants.ConfigMapCapabilitiesGeneratorVolumeName,
-		VolumeSource: newVolumeSource(configMapNames.CapabilitiesGenerator),
-	})
-
-	// Add mapfilegenerator config and styling-files (if applicable) here to get the same order as the ansible operator
-	// Needed to compare deployments from the ansible operator and this one
-	if obj.Mapfile() == nil {
-		volumes = append(volumes, corev1.Volume{
-			Name:         constants.ConfigMapMapfileGeneratorVolumeName,
-			VolumeSource: newVolumeSource(configMapNames.MapfileGenerator),
-		})
-	}
-
-	if obj.Type() == pdoknlv3.ServiceTypeWMS {
-		if obj.Mapfile() == nil {
-			wms, _ := any(obj).(*pdoknlv3.WMS)
-			stylingFilesVolumeProjections := []corev1.VolumeProjection{}
-			if wms.Spec.Service.StylingAssets != nil && wms.Spec.Service.StylingAssets.ConfigMapRefs != nil {
-				for _, cf := range wms.Spec.Service.StylingAssets.ConfigMapRefs {
-					stylingFilesVolumeProjections = append(stylingFilesVolumeProjections, corev1.VolumeProjection{
-						ConfigMap: &corev1.ConfigMapProjection{
-							LocalObjectReference: corev1.LocalObjectReference{
-								Name: cf.Name,
-							},
-						},
-					})
-				}
-			}
-
-			stylingFilesVolume := corev1.Volume{
-				Name: constants.ConfigMapStylingFilesVolumeName,
-				VolumeSource: corev1.VolumeSource{
-					Projected: &corev1.ProjectedVolumeSource{
-						Sources: stylingFilesVolumeProjections,
-					},
-				},
-			}
-
-			volumes = append(volumes, stylingFilesVolume)
-		}
-
-		lgVolume := corev1.Volume{
-			Name:         constants.ConfigMapLegendGeneratorVolumeName,
-			VolumeSource: newVolumeSource(configMapNames.LegendGenerator),
-		}
-		figVolume := corev1.Volume{
-			Name:         constants.ConfigMapFeatureinfoGeneratorVolumeName,
-			VolumeSource: newVolumeSource(configMapNames.FeatureInfoGenerator),
-		}
-		volumes = append(volumes, figVolume, lgVolume)
-	}
-
-	return volumes
-}
-
-func GetVolumeMountsForDeployment[O pdoknlv3.WMSWFS](obj O) []corev1.VolumeMount {
-	volumeMounts := []corev1.VolumeMount{
-		utils.GetBaseVolumeMount(),
-		utils.GetDataVolumeMount(),
-	}
-
-	staticFiles, _ := static.GetStaticFiles()
-	for _, name := range staticFiles {
-		volumeMounts = append(volumeMounts, corev1.VolumeMount{
-			Name:      constants.MapserverName,
-			MountPath: "/srv/mapserver/config/" + name,
-			SubPath:   name,
-		})
-	}
-
-	// Custom mapfile
-	if mapfile := obj.Mapfile(); mapfile != nil {
-		volumeMounts = append(volumeMounts, utils.GetMapfileVolumeMount())
-	}
-
-	return volumeMounts
-}
-
 func GetMapfileEnvVar[O pdoknlv3.WMSWFS](obj O) corev1.EnvVar {
 	mapFileName := "service.map"
 	if obj.Mapfile() != nil {
@@ -275,128 +103,7 @@ func GetMapfileEnvVar[O pdoknlv3.WMSWFS](obj O) corev1.EnvVar {
 	}
 }
 
-func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) []corev1.EnvVar {
-	return []corev1.EnvVar{
-		{
-			Name:  "SERVICE_TYPE",
-			Value: string(obj.Type()),
-		}, {
-			Name:  "MAPSERVER_CONFIG_FILE",
-			Value: "/srv/mapserver/config/default_mapserver.conf",
-		},
-		GetMapfileEnvVar(obj),
-		{
-			Name: "AZURE_STORAGE_CONNECTION_STRING",
-			ValueFrom: &corev1.EnvVarSource{
-				SecretKeyRef: &corev1.SecretKeySelector{
-					LocalObjectReference: corev1.LocalObjectReference{
-						Name: blobsSecretName, // TODO
-					},
-					Key: "AZURE_STORAGE_CONNECTION_STRING",
-				},
-			},
-		},
-	}
-}
-
-// TODO fix linting (cyclop,funlen)
-// Resources for mapserver container
-//
-//nolint:cyclop,funlen
-func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) corev1.ResourceRequirements {
-	resources := corev1.ResourceRequirements{
-		Limits:   corev1.ResourceList{},
-		Requests: corev1.ResourceList{},
-	}
-
-	maxResourceVal := func(v1 *resource.Quantity, v2 *resource.Quantity) *resource.Quantity {
-		switch {
-		case v1 != nil && v2 != nil:
-			if v1.Value() > v2.Value() {
-				return v1
-			}
-			return v2
-		case v1 != nil && v2 == nil:
-			return v1
-		case v1 == nil || v2 != nil:
-			return v2
-		default:
-
-		}
-
-		return &resource.Quantity{}
-	}
-
-	objResources := &corev1.ResourceRequirements{}
-	if obj.PodSpecPatch() != nil {
-		found := false
-		for _, container := range obj.PodSpecPatch().Containers {
-			if container.Name == constants.MapserverName {
-				objResources = &container.Resources
-				found = true
-				break
-			}
-		}
-
-		if !found && obj.PodSpecPatch().Resources != nil {
-			objResources = obj.PodSpecPatch().Resources
-		}
-
-	}
-
-	/**
-	Set CPU request and limit
-	*/
-	cpuRequest := objResources.Requests.Cpu()
-	if cpuRequest == nil || cpuRequest.IsZero() {
-		cpuRequest = smoothoperatorutils.Pointer(resource.MustParse("0.15"))
-		if obj.Type() == pdoknlv3.ServiceTypeWMS && obj.Options().UseWebserviceProxy() {
-			cpuRequest = smoothoperatorutils.Pointer(resource.MustParse("0.1"))
-		}
-	}
-	resources.Requests[corev1.ResourceCPU] = *cpuRequest
-
-	cpuLimit := objResources.Limits.Cpu()
-	if cpuLimit != nil && !cpuLimit.IsZero() {
-		resources.Limits[corev1.ResourceCPU] = *maxResourceVal(cpuLimit, cpuRequest)
-	}
-
-	/**
-	Set memory limit/request if the request is higher than the limit the request is used as limit
-	*/
-	memoryRequest := objResources.Requests.Memory()
-	if memoryRequest != nil && !memoryRequest.IsZero() {
-		resources.Requests[corev1.ResourceMemory] = *memoryRequest
-	}
-
-	memoryLimit := objResources.Limits.Memory()
-	if memoryLimit == nil || memoryLimit.IsZero() {
-		memoryLimit = smoothoperatorutils.Pointer(resource.MustParse("800M"))
-	}
-	resources.Limits[corev1.ResourceMemory] = *maxResourceVal(memoryLimit, memoryRequest)
-
-	/**
-	Set ephemeral-storage if there is no ephemeral volume
-	*/
-	// TODO fix linting (nestif)
-	if use, _ := mapperutils.UseEphemeralVolume(obj); !use {
-		ephemeralStorageRequest := mapperutils.EphemeralStorageRequest(obj)
-		if ephemeralStorageRequest != nil {
-			resources.Requests[corev1.ResourceEphemeralStorage] = *ephemeralStorageRequest
-		}
-
-		ephemeralStorageLimit := mapperutils.EphemeralStorageLimit(obj)
-		defaultEphemeralStorageLimit := resource.MustParse("200M")
-		if ephemeralStorageLimit == nil || ephemeralStorageLimit.IsZero() || ephemeralStorageLimit.Value() < defaultEphemeralStorageLimit.Value() {
-			ephemeralStorageLimit = smoothoperatorutils.Pointer(defaultEphemeralStorageLimit)
-		}
-		resources.Limits[corev1.ResourceEphemeralStorage] = *maxResourceVal(ephemeralStorageLimit, ephemeralStorageRequest)
-	}
-
-	return resources
-}
-
-func GetProbesForDeployment[O pdoknlv3.WMSWFS](obj O) (livenessProbe *corev1.Probe, readinessProbe *corev1.Probe, startupProbe *corev1.Probe, err error) {
+func getProbes[O pdoknlv3.WMSWFS](obj O) (livenessProbe *corev1.Probe, readinessProbe *corev1.Probe, startupProbe *corev1.Probe, err error) {
 	livenessProbe = getLivenessProbe(obj)
 	switch obj.Type() {
 	case pdoknlv3.ServiceTypeWFS: