Postgis config

Author: Jelle Dijkstra

api/v2beta1/wms_types.go

@@ -54,7 +54,7 @@ type WMSSpec struct {
 
 // WMSService is the struct for all service level fields
 type WMSService struct {
-	Inspire  bool   `json:"inspire"`
+	Inspire  bool   `json:"inspire,omitempty"`
 	Title    string `json:"title"`
 	Abstract string `json:"abstract"`
 	// +kubebuilder:default="https://creativecommons.org/publicdomain/zero/1.0/deed.nl"

config/crd/bases/pdok.nl_wms.yaml

@@ -389,7 +389,6 @@ spec:
                     - abstract
                     - authority
                     - dataEPSG
-                    - inspire
                     - keywords
                     - layers
                     - metadataIdentifier

internal/controller/shared_controller.go

@@ -55,8 +55,8 @@ const (
 	blobsConfigPrefix          = "blobs-"
 	blobsSecretPrefix          = "blobs-"
 	capabilitiesGeneratorInput = "input.yaml"
-	postgisConfigName          = "postgisConfig"
-	postgisSecretName          = "postgisSecret"
+	postgisConfigPrefix        = "postgres-"
+	postgisSecretPrefix        = "postgres-"
 )
 
 var (
@@ -235,12 +235,22 @@ func getInitContainerForDeployment[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O)
 		return nil, err
 	}
 
+	postgresConfig, err := smoothoperatork8s.GetConfigMap(getReconcilerClient(r), obj.GetNamespace(), postgisConfigPrefix, make(map[string]string))
+	if err != nil {
+		return nil, err
+	}
+
+	postgresSecret, err := smoothoperatork8s.GetSecret(getReconcilerClient(r), obj.GetNamespace(), postgisSecretPrefix, make(map[string]string))
+	if err != nil {
+		return nil, err
+	}
+
 	images := getReconcilerImages(r)
 	blobDownloadInitContainer, err := blobdownload.GetBlobDownloadInitContainer(obj, images.MultitoolImage, blobsConfig.Name, blobsSecret.Name, srvDir)
 	if err != nil {
 		return nil, err
 	}
-	mapfileGeneratorInitContainer, err := mapfilegenerator.GetMapfileGeneratorInitContainer(obj, images.MapfileGeneratorImage, postgisConfigName, postgisSecretName, srvDir)
+	mapfileGeneratorInitContainer, err := mapfilegenerator.GetMapfileGeneratorInitContainer(obj, images.MapfileGeneratorImage, postgresConfig.Name, postgresSecret.Name, srvDir)
 	if err != nil {
 		return nil, err
 	}

internal/controller/suite_test.go

@@ -140,13 +140,32 @@ var _ = BeforeSuite(func() {
 	err = k8sClient.Create(ctx, blobConfig)
 	Expect(err).NotTo(HaveOccurred())
 
-	blobSecret := v1.Secret{
+	blobSecret := &v1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      blobsSecretPrefix + "testtest",
 			Namespace: metav1.NamespaceDefault,
 		},
 	}
-	err = k8sClient.Create(ctx, &blobSecret)
+	err = k8sClient.Create(ctx, blobSecret)
+	Expect(err).NotTo(HaveOccurred())
+
+	// Deploy postgres configmap + secret
+	postgresConfig := &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      postgisConfigPrefix + "testtest",
+			Namespace: metav1.NamespaceDefault,
+		},
+	}
+	err = k8sClient.Create(ctx, postgresConfig)
+	Expect(err).NotTo(HaveOccurred())
+
+	postgresSecret := &v1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      postgisSecretPrefix + "testtest",
+			Namespace: metav1.NamespaceDefault,
+		},
+	}
+	err = k8sClient.Create(ctx, postgresSecret)
 	Expect(err).NotTo(HaveOccurred())
 
 	// Load CRD schemas