Requested changes

Author: Jelle Dijkstra

got.txt

@@ -0,0 +1,17 @@
+set -e;
+            mkdir -p /srv/data/config/;
+            rclone config create --non-interactive --obscure blobs azureblob endpoint $BLOBS_ENDPOINT account $BLOBS_ACCOUNT key $BLOBS_KEY use_emulator true;
+            bash /srv/scripts/gpkg_download.sh;
+            rclone copyto blobs:/resources-bucket/key/gpkg-symbol.png /srv/data/images/gpkg-symbol.png || exit 1;
+            rclone copyto blobs:/resources-bucket/key/symbol.svg /srv/data/images/symbol.svg || exit 1;
+            rclone copyto blobs:/resources-bucket/key/font-1.ttf /srv/data/images/font-1.ttf || exit 1;
+            rclone copyto blobs:/resources-bucket/key/font-2.ttf /srv/data/images/font-2.ttf || exit 1;
+            echo 'generated fonts.list:';
+            cat /srv/data/config/fonts/fonts.list;
+            mkdir -p /var/www/legend/wms-gpkg-layer-1-name;
+            rclone copyto blobs:/resources-bucket/key/gpkg-layer-1-legend.png  /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png || exit 1;
+            Copied legend gpkg-layer-1-legend.png to /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png;
+            mkdir -p /var/www/legend/wms-gpkg-layer-2-name;
+            rclone copyto blobs:/resources-bucket/key/gpkg-layer-2-legend.png  /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png || exit 1;
+            Copied legend gpkg-layer-2-legend.png to /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png;
+            chown -R 999:999 /var/www/legend

internal/controller/blobdownload/blob_download.go

@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"fmt"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
+	"k8s.io/utils/strings/slices"
 	"regexp"
 	"strings"
 
@@ -32,7 +33,10 @@ func GetScript() string {
 func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, image, blobsConfigName, blobsSecretName, srvDir string) (*corev1.Container, error) {
 	blobkeys := []string{}
 	for _, gpkg := range obj.GeoPackages() {
-		blobkeys = append(blobkeys, gpkg.BlobKey)
+		// Deduplicate blobkeys to prevent double downloads
+		if !slices.Contains(blobkeys, gpkg.BlobKey) {
+			blobkeys = append(blobkeys, gpkg.BlobKey)
+		}
 	}
 
 	initContainer := corev1.Container{
@@ -158,7 +162,7 @@ func downloadStylingAssets(sb *strings.Builder, wms *pdoknlv3.WMS) error {
 		return nil
 	}
 
-	re := regexp.MustCompile(`.*\\.(ttf)$`)
+	re := regexp.MustCompile(`.*\.(ttf)$`)
 	for _, blobKey := range wms.Spec.Service.StylingAssets.BlobKeys {
 		fileName, err := getFilenameFromBlobKey(blobKey)
 		if err != nil {

internal/controller/shared_controller.go

@@ -304,7 +304,7 @@ func getContainersForDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O) ([]
 				},
 			},
 			Args: []string{
-				"-scrape_uri=http://localhost/server-status?auto",
+				"--scrape_uri=http://localhost/server-status?auto",
 			},
 			Resources: corev1.ResourceRequirements{
 				Limits: corev1.ResourceList{

want.txt

@@ -0,0 +1,19 @@
+want set -e;
+            mkdir -p /srv/data/config/;
+            rclone config create --non-interactive --obscure blobs azureblob endpoint $BLOBS_ENDPOINT account $BLOBS_ACCOUNT key $BLOBS_KEY use_emulator true;
+            bash /srv/scripts/gpkg_download.sh;
+            rclone copyto blobs:/resources-bucket/key/gpkg-symbol.png /srv/data/images/gpkg-symbol.png || exit 1;
+            rclone copyto blobs:/resources-bucket/key/symbol.svg /srv/data/images/symbol.svg || exit 1;
+            rclone copyto blobs:/resources-bucket/key/font-1.ttf /srv/data/config/fonts/font-1.ttf || exit 1;
+            echo font-1 font-1.ttf >> /srv/data/config/fonts/fonts.list;
+            rclone copyto blobs:/resources-bucket/key/font-2.ttf /srv/data/config/fonts/font-2.ttf || exit 1;
+            echo font-2 font-2.ttf >> /srv/data/config/fonts/fonts.list;
+            echo 'generated fonts.list:';
+            cat /srv/data/config/fonts/fonts.list;
+            mkdir -p /var/www/legend/wms-gpkg-layer-1-name;
+            rclone copyto blobs:/resources-bucket/key/gpkg-layer-1-legend.png  /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png || exit 1;
+            Copied legend gpkg-layer-1-legend.png to /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png;
+            mkdir -p /var/www/legend/wms-gpkg-layer-2-name;
+            rclone copyto blobs:/resources-bucket/key/gpkg-layer-2-legend.png  /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png || exit 1;
+            Copied legend gpkg-layer-2-legend.png to /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png;
+            chown -R 999:999 /var/www/legend