removed unneeded getbare functions

Author: Shalucik

internal/controller/shared_controller.go

@@ -131,13 +131,13 @@ func getSharedBareObjects[O pdoknlv3.WMSWFS](obj O) []client.Object {
 		getBareDeployment(obj),
 		getBareIngressRoute(obj),
 		getBareHorizontalPodAutoScaler(obj),
-		getBareConfigMapBlobDownload(obj),
+		getBareConfigMap(obj, InitScriptsName),
 		getBareConfigMap(obj, MapserverName),
 		getBareService(obj),
 		getBareCorsHeadersMiddleware(obj),
 		getBarePodDisruptionBudget(obj),
-		getBareConfigMapMapfileGenerator(obj),
-		getBareConfigMapCapabilitiesGenerator(obj),
+		getBareConfigMap(obj, MapfileGeneratorName),
+		getBareConfigMap(obj, CapabilitiesGeneratorName),
 	}
 }
 
@@ -563,24 +563,6 @@ func getLegendMatchRule(wms *pdoknlv3.WMS) string {
 	return "(Host(`localhost`) || Host(`" + host + "`)) && PathPrefix(`/" + pdoknlv3.GetBaseURLPath(wms) + "/legend`)"
 }
 
-func getBareConfigMapMapfileGenerator[O pdoknlv3.WMSWFS](obj O) *corev1.ConfigMap {
-	return &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      getSuffixedName(obj, "mapfile-generator"),
-			Namespace: obj.GetNamespace(),
-		},
-	}
-}
-
-func getBareConfigMapCapabilitiesGenerator[O pdoknlv3.WMSWFS](obj O) *corev1.ConfigMap {
-	return &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      getSuffixedName(obj, "capabilities-generator"),
-			Namespace: obj.GetNamespace(),
-		},
-	}
-}
-
 func mutateConfigMapCapabilitiesGenerator[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *corev1.ConfigMap, ownerInfo *smoothoperatorv1.OwnerInfo) error {
 	reconcilerClient := getReconcilerClient(r)
 
@@ -734,15 +716,6 @@ func mutateHorizontalPodAutoscaler[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O,
 	return ctrl.SetControllerReference(obj, autoscaler, getReconcilerScheme(r))
 }
 
-func getBareConfigMapBlobDownload[O pdoknlv3.WMSWFS](obj O) *corev1.ConfigMap {
-	return &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      getSuffixedName(obj, "init-scripts"),
-			Namespace: obj.GetNamespace(),
-		},
-	}
-}
-
 func mutateConfigMapBlobDownload[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *corev1.ConfigMap) error {
 	reconcilerClient := getReconcilerClient(r)
 

internal/controller/shared_controller_test.go

@@ -60,7 +60,7 @@ func getExpectedObjects[O pdoknlv3.WMSWFS](ctx context.Context, obj O, includeBl
 	objects = append(objects, cm)
 
 	if includeMapfileGeneratorConfigMap {
-		cm = getBareConfigMapMapfileGenerator(obj)
+		cm = getBareConfigMap(obj, MapfileGeneratorName)
 		hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapMapfileGeneratorVolumeName)
 		if err != nil {
 			return objects, err
@@ -69,7 +69,7 @@ func getExpectedObjects[O pdoknlv3.WMSWFS](ctx context.Context, obj O, includeBl
 		objects = append(objects, cm)
 	}
 
-	cm = getBareConfigMapCapabilitiesGenerator(obj)
+	cm = getBareConfigMap(obj, CapabilitiesGeneratorName)
 	hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapCapabilitiesGeneratorVolumeName)
 	if err != nil {
 		return objects, err
@@ -78,7 +78,7 @@ func getExpectedObjects[O pdoknlv3.WMSWFS](ctx context.Context, obj O, includeBl
 	objects = append(objects, cm)
 
 	if includeBlobDownload {
-		cm = getBareConfigMapBlobDownload(obj)
+		cm = getBareConfigMap(obj, InitScriptsName)
 		hashedName, err = getHashedConfigMapNameFromClient(ctx, obj, mapserver.ConfigMapBlobDownloadVolumeName)
 		if err != nil {
 			return objects, err

internal/controller/wfs_controller_test.go

@@ -399,7 +399,7 @@ var _ = Describe("WFS Controller", func() {
 			By("Reconciling the WFS and checking the configMap")
 			reconcileWFS(controllerReconciler, wfs, typeNamespacedNameWfs)
 
-			configMap := getBareConfigMapMapfileGenerator(wfs)
+			configMap := getBareConfigMap(wfs, MapfileGeneratorName)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wfs, mapserver.ConfigMapMapfileGeneratorVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {
@@ -424,7 +424,7 @@ var _ = Describe("WFS Controller", func() {
 			By("Reconciling the WFS and checking the configMap")
 			reconcileWFS(controllerReconciler, wfs, typeNamespacedNameWfs)
 
-			configMap := getBareConfigMapBlobDownload(wfs)
+			configMap := getBareConfigMap(wfs, InitScriptsName)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wfs, mapserver.ConfigMapBlobDownloadVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {
@@ -449,7 +449,7 @@ var _ = Describe("WFS Controller", func() {
 			By("Reconciling the WFS and checking the configMap")
 			reconcileWFS(controllerReconciler, wfs, typeNamespacedNameWfs)
 
-			configMap := getBareConfigMapCapabilitiesGenerator(wfs)
+			configMap := getBareConfigMap(wfs, CapabilitiesGeneratorName)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wfs, mapserver.ConfigMapCapabilitiesGeneratorVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {

internal/controller/wms_controller_test.go

@@ -575,7 +575,7 @@ var _ = Describe("WMS Controller", func() {
 			By("Reconciling the WMS and checking the configMap")
 			reconcileWMS(controllerReconciler, wms, typeNamespacedNameWms)
 
-			configMap := getBareConfigMapMapfileGenerator(wms)
+			configMap := getBareConfigMap(wms, mapfileGeneratorInput)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wms, mapserver.ConfigMapMapfileGeneratorVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {
@@ -600,7 +600,7 @@ var _ = Describe("WMS Controller", func() {
 			By("Reconciling the WMS and checking the configMap")
 			reconcileWMS(controllerReconciler, wms, typeNamespacedNameWms)
 
-			configMap := getBareConfigMapBlobDownload(wms)
+			configMap := getBareConfigMap(wms, InitScriptsName)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wms, mapserver.ConfigMapBlobDownloadVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {
@@ -625,7 +625,7 @@ var _ = Describe("WMS Controller", func() {
 			By("Reconciling the WMS and checking the configMap")
 			reconcileWMS(controllerReconciler, wms, typeNamespacedNameWms)
 
-			configMap := getBareConfigMapCapabilitiesGenerator(wms)
+			configMap := getBareConfigMap(wms, CapabilitiesGeneratorName)
 			configMapName, err := getHashedConfigMapNameFromClient(ctx, wms, mapserver.ConfigMapCapabilitiesGeneratorVolumeName)
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(func() bool {