Applied changes to WMS

Author: Jelle Dijkstra

api/v2beta1/wms_conversion.go

@@ -74,7 +74,7 @@ func V3HubFromV2(src *WMS, target *pdoknlv3.WMS) {
 		dst.Spec.PodSpecPatch = ConvertResources(*src.Spec.Kubernetes.Resources)
 	}
 
-	dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
+	dst.Spec.Options = *ConvertOptionsV2ToV3(src.Spec.Options)
 
 	service := pdoknlv3.WMSService{
 		URL:               CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
@@ -153,9 +153,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 
 	dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
 
-	if src.Spec.Options != nil {
-		dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
-	}
+	dst.Spec.Options = ConvertOptionsV3ToV2(&src.Spec.Options)
 
 	service := WMSService{
 		Title:              src.Spec.Service.Title,

api/v3/wms_types.go

@@ -54,17 +54,18 @@ type WMSSpec struct {
 	// Optional strategic merge patch for the pod in the deployment. E.g. to patch the resources or add extra env vars.
 	PodSpecPatch                 *corev1.PodSpec                            `json:"podSpecPatch,omitempty"`
 	HorizontalPodAutoscalerPatch *autoscalingv2.HorizontalPodAutoscalerSpec `json:"horizontalPodAutoscalerPatch"`
-	Options                      *Options                                   `json:"options"`
+	Options                      Options                                    `json:"options,omitempty"`
 	Service                      WMSService                                 `json:"service"`
 }
 
 type WMSService struct {
-	URL               string         `json:"url"`
-	Title             string         `json:"title"`
-	Abstract          string         `json:"abstract"`
-	Keywords          []string       `json:"keywords"`
-	OwnerInfoRef      string         `json:"ownerInfoRef"`
-	Fees              *string        `json:"fees,omitempty"`
+	URL          string   `json:"url"`
+	Title        string   `json:"title"`
+	Abstract     string   `json:"abstract"`
+	Keywords     []string `json:"keywords"`
+	OwnerInfoRef string   `json:"ownerInfoRef"`
+	Fees         *string  `json:"fees,omitempty"`
+	// +kubebuilder:default="https://creativecommons.org/publicdomain/zero/1.0/deed.nl"
 	AccessConstraints string         `json:"accessConstraints"`
 	MaxSize           *int32         `json:"maxSize,omitempty"`
 	Inspire           *Inspire       `json:"inspire,omitempty"`

api/v3/zz_generated.deepcopy.go

@@ -45,7 +45,7 @@ spec:
         csw:
           metadataIdentifier: 68a42961-ed55-436b-a412-cc7424fd2a6e
       spatialDatasetIdentifier: ""
-      language: "nl"
+      language: "dut"
     ownerInfoRef: pdok
     title: "Dataset"
     abstract: "Dataset beschrijving ..."

config/samples/v3_wfs.yaml

@@ -55,7 +55,7 @@ spec:
         csw:
           metadataIdentifier: 1234abcd-1234-abcd-1234-abcd1234abcd
       spatialDatasetIdentifier: abcd1234-abcd-1234-abcd-1234abcd1234
-      language: "nl"
+      language: "dut"
     dataEPSG: EPSG:28992
     resolution:
     defResolution:

config/samples/v3_wms.yaml

@@ -45,7 +45,7 @@ spec:
         csw:
           metadataIdentifier: 68a42961-ed55-436b-a412-cc7424fd2a6e
       spatialDatasetIdentifier: ""
-      language: "nl"
+      language: "dut"
     ownerInfoRef: pdok
     title: "Dataset"
     abstract: "Dataset beschrijving ..."