Merge pull request #90 from PDOK/wr/fix-include

fix extra slash

Author: Shalucik

internal/controller/configmaps.go

@@ -120,7 +120,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor
 	for _, name := range staticFileName {
 		content := contents[name]
 		if name == "include.conf" {
-			content = []byte(strings.ReplaceAll(string(content), "{{ service_path }}", obj.URL().Path))
+			content = []byte(strings.ReplaceAll(string(content), "/{{ service_path }}", obj.URL().Path))
 		}
 		configMap.Data[name] = string(content)
 	}

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

@@ -130,7 +130,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-mapserver-d84299cgbk
+  name: complete-wfs-mapserver-4dm5625f45
   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-d84299cgbk
+            name: complete-wfs-mapserver-4dm5625f45
             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-49t5fd5c5d
+  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-49t5fd5c5d
+            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-49t5fd5c5d
+  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-49t5fd5c5d
+            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-6k9496ckg7
+  name: complete-wms-mapserver-84kmc4cbf6
   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-6k9496ckg7
+            name: complete-wms-mapserver-84kmc4cbf6
             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-thkgc6d66b
+  name: custom-mapfile-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3