Removed "/" and changed hashes

Author: Daimanta

internal/controller/configmaps.go

@@ -137,7 +137,7 @@ func updateConfigMapWithStaticFiles[O pdoknlv3.WMSWFS](configMap *corev1.ConfigM
 			rewriteRules := make([]string, 0)
 			for _, ingressRouteUrl := range ingressRouteUrls {
 				rewriteRules = append(rewriteRules, fmt.Sprintf("  \"%s/legend(.*)\" => \"/legend$1\"", ingressRouteUrl.URL.Path))
-				rewriteRules = append(rewriteRules, fmt.Sprintf("  \"%s/(.*)\" => \"/mapserver$1\"", ingressRouteUrl.URL.Path))
+				rewriteRules = append(rewriteRules, fmt.Sprintf("  \"%s(.*)\" => \"/mapserver$1\"", ingressRouteUrl.URL.Path))
 			}
 
 			content = []byte(strings.ReplaceAll(string(content), "{{ rewrite_rules }}", strings.Join(rewriteRules, ",\n")))

internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml

@@ -18,9 +18,9 @@ data:
 
     url.rewrite-once = (
       "/datasetOwner/dataset/theme/wfs/v1_0/legend(.*)" => "/legend$1",
-      "/datasetOwner/dataset/theme/wfs/v1_0/(.*)" => "/mapserver$1",
+      "/datasetOwner/dataset/theme/wfs/v1_0(.*)" => "/mapserver$1",
       "/other/path/legend(.*)" => "/legend$1",
-      "/other/path/(.*)" => "/mapserver$1"
+      "/other/path(.*)" => "/mapserver$1"
     )
 
     magnet.attract-raw-url-to += ( "/srv/mapserver/config/ogc.lua" )
@@ -132,7 +132,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-mapserver-2t9g82kkt6
+  name: complete-wfs-mapserver-bfcm4d47kh
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/complete/expected/deployment.yaml

@@ -253,7 +253,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: complete-wfs-mapserver-2t9g82kkt6
+            name: complete-wfs-mapserver-bfcm4d47kh
             defaultMode: 420
           name: mapserver
         - configMap:

internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml

@@ -15,7 +15,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wfs
     service-version: v1_0
-  name: minimal-wfs-mapserver-mgt56bcd8d
+  name: minimal-wfs-mapserver-f5ch9b2bhh
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/minimal/expected/deployment.yaml

@@ -236,7 +236,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: minimal-wfs-mapserver-mgt56bcd8d
+            name: minimal-wfs-mapserver-f5ch9b2bhh
             defaultMode: 420
           name: mapserver
         - configMap:

internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml

@@ -15,7 +15,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wfs
     service-version: v1_0
-  name: noprefetch-wfs-mapserver-mgt56bcd8d
+  name: noprefetch-wfs-mapserver-f5ch9b2bhh
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml

@@ -232,7 +232,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: noprefetch-wfs-mapserver-mgt56bcd8d
+            name: noprefetch-wfs-mapserver-f5ch9b2bhh
             defaultMode: 420
           name: mapserver
         - configMap:

internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml

@@ -136,7 +136,7 @@ metadata:
     service-type: wms
     service-version: v1_0
     theme: "2016"
-  name: complete-wms-mapserver-km75fft7hd
+  name: complete-wms-mapserver-88ckd472mk
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wms/complete/expected/deployment.yaml

@@ -366,7 +366,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: complete-wms-mapserver-km75fft7hd
+            name: complete-wms-mapserver-88ckd472mk
             defaultMode: 420
           name: mapserver
         - configMap:

internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml

@@ -135,7 +135,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: custom-mapfile-wms-mapserver-7hd85t8f98
+  name: custom-mapfile-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3