PDOK-17792 VolumeAmount styling-files toevoegen

Author: rahmabPublic

internal/controller/mapfilegenerator/mapfile_generator.go

@@ -30,6 +30,10 @@ func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, image, postgisCo
 		},
 	}
 
+	if obj.Type() == pdoknlv3.ServiceTypeWMS {
+		stylingFilesVolAm := corev1.VolumeMount{Name: "styling-files", MountPath: "/styling", ReadOnly: true}
+		initContainer.VolumeMounts = append(initContainer.VolumeMounts, stylingFilesVolAm)
+	}
 	// Additional mapfile-generator configuration
 	if obj.HasPostgisData() {
 		initContainer.EnvFrom = []corev1.EnvFromSource{

internal/controller/mapserver/deployment.go

@@ -117,7 +117,30 @@ func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.Hash
 				},
 			},
 		}
-		volumes = append(volumes, lgVolume, figVolume)
+		stylingFilesVolume := v1.Volume{
+			Name: "styling-files",
+			VolumeSource: v1.VolumeSource{
+				Projected: &v1.ProjectedVolumeSource{
+					Sources: []v1.VolumeProjection{
+						{
+							ConfigMap: &v1.ConfigMapProjection{
+								LocalObjectReference: v1.LocalObjectReference{
+									Name: "gpkg-styling",
+								},
+							},
+						},
+						{
+							ConfigMap: &v1.ConfigMapProjection{
+								LocalObjectReference: v1.LocalObjectReference{
+									Name: "tif-styling",
+								},
+							},
+						},
+					},
+				},
+			},
+		}
+		volumes = append(volumes, lgVolume, figVolume, stylingFilesVolume)
 	}
 
 	if options := obj.Options(); options != nil {

internal/controller/wms_controller_test.go

@@ -278,14 +278,15 @@ var _ = Describe("WMS Controller", func() {
 			Expect(blobDownloadContainer.VolumeMounts).Should(Equal(volumeMounts))
 			Expect(blobDownloadContainer.EnvFrom).Should(Equal(envFrom))
 			Expect(blobDownloadContainer.Command).Should(Equal([]string{"/bin/sh", "-c"}))
-			Expect(len(blobDownloadContainer.Args)).Should(BeNumerically(">", 0))
+			Expect(len(blobDownloadContainer.Args)).Should(BeNumerically("==", 1))
 
 			mapfileGeneratorContainer, err := getInitContainer("mapfile-generator", deployment)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(mapfileGeneratorContainer.Image).Should(Equal(reconcilerImages.MapfileGeneratorImage))
 			volumeMounts = []v1.VolumeMount{
 				{Name: "base", MountPath: "/srv/data"},
 				{Name: mapserver.ConfigMapMapfileGeneratorVolumeName, MountPath: "/input", ReadOnly: true},
+				{Name: "styling-files", MountPath: "/styling", ReadOnly: true},
 			}
 			Expect(mapfileGeneratorContainer.VolumeMounts).Should(Equal(volumeMounts))
 			Expect(mapfileGeneratorContainer.Command).Should(Equal([]string{"generate-mapfile"}))