First try

Author: Jelle Dijkstra

Dockerfile

@@ -3,7 +3,7 @@ FROM docker.io/golang:1.24 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
-#COPY --from=repos ./smooth-operator /smooth-operator
+COPY --from=repos ./smooth-operator /smooth-operator
 #COPY --from=repos ./ogc-specifications /ogc-specifications
 
 WORKDIR /workspace

api/v2beta1/shared_conversion.go

@@ -1,17 +1,21 @@
 package v2beta1
 
 import (
-	"net/url"
-
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/constants"
 	smoothoperatormodel "github.com/pdok/smooth-operator/model"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
+	"net/url"
+	"strings"
 
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 )
 
+func fixUnicode(val string) string {
+	return strings.ReplaceAll(val, "\\xF6", "ö")
+}
+
 func ConvertOptionsV2ToV3(src *WMSWFSOptions) *pdoknlv3.Options {
 	defaults := pdoknlv3.GetDefaultOptions()
 

api/v2beta1/wfs_conversion.go

@@ -89,9 +89,9 @@ func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 	}
 
 	allOtherCrs := []string{
+		"EPSG:28992",
 		"EPSG:25831",
 		"EPSG:25832",
-		"EPSG:28992",
 		"EPSG:3034",
 		"EPSG:3035",
 		"EPSG:3857",

api/v2beta1/wms_conversion.go

@@ -97,8 +97,8 @@ func (src *WMS) ToV3(target *pdoknlv3.WMS) error {
 		Prefix:            src.Spec.General.Dataset,
 		URL:               *url,
 		OwnerInfoRef:      "pdok",
-		Title:             src.Spec.Service.Title,
-		Abstract:          src.Spec.Service.Abstract,
+		Title:             fixUnicode(src.Spec.Service.Title),
+		Abstract:          fixUnicode(src.Spec.Service.Abstract),
 		Keywords:          src.Spec.Service.Keywords,
 		AccessConstraints: smoothoperatormodel.URL{URL: accessConstraints},
 	},
@@ -393,8 +393,8 @@ func (v2Service WMSService) MapLayersToV3() pdoknlv3.Layer {
 		}
 
 		topLayer = &pdoknlv3.Layer{
-			Title:         &v2Service.Title,
-			Abstract:      &v2Service.Abstract,
+			Title:         smoothoperatorutils.Pointer(fixUnicode(v2Service.Title)),
+			Abstract:      smoothoperatorutils.Pointer(fixUnicode(v2Service.Abstract)),
 			Keywords:      v2Service.Keywords,
 			Layers:        []pdoknlv3.Layer{},
 			BoundingBoxes: getDefaultWMSLayerBoundingBoxes(bbox),
@@ -522,10 +522,14 @@ func getDefaultWMSLayerBoundingBoxes(defaultBbox *pdoknlv3.WMSBoundingBox) []pdo
 }
 
 func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
+	var abstract *string
+	if v2Layer.Abstract != nil {
+		abstract = smoothoperatorutils.Pointer(fixUnicode(*v2Layer.Abstract))
+	}
 	layer := pdoknlv3.Layer{
 		Name:                &v2Layer.Name,
 		Title:               v2Layer.Title,
-		Abstract:            v2Layer.Abstract,
+		Abstract:            abstract,
 		Keywords:            v2Layer.Keywords,
 		LabelNoClip:         v2Layer.LabelNoClip,
 		Styles:              []pdoknlv3.Style{},

go.mod

@@ -24,6 +24,8 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
+replace github.com/pdok/smooth-operator => ../smooth-operator
+
 replace github.com/abbot/go-http-auth => github.com/abbot/go-http-auth v0.4.0 // for github.com/traefik/traefik/v3
 
 require (

internal/controller/shared_controller.go

@@ -3,7 +3,9 @@ package controller
 import (
 	"context"
 	"fmt"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -25,6 +27,7 @@ import (
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	"github.com/pdok/mapserver-operator/internal/controller/types"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	smoothoperatorstatus "github.com/pdok/smooth-operator/pkg/status"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -35,15 +38,20 @@ const (
 	InspireLabelKey = "pdok.nl/inspire"
 )
 
-func setWatches(mgr *builder.TypedBuilder[reconcile.Request]) *builder.TypedBuilder[reconcile.Request] {
-	return mgr.Owns(&corev1.ConfigMap{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
+func createControllerManager(mgr ctrl.Manager, obj client.Object) *builder.TypedBuilder[reconcile.Request] {
+	kind := obj.GetObjectKind().GroupVersionKind().Kind
+
+	controllerMgr := ctrl.NewControllerManagedBy(mgr).For(obj).Named(strings.ToLower(kind))
+	controllerMgr.Owns(&corev1.ConfigMap{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&appsv1.Deployment{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&corev1.Service{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&traefikiov1alpha1.Middleware{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&traefikiov1alpha1.IngressRoute{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&autoscalingv2.HorizontalPodAutoscaler{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&policyv1.PodDisruptionBudget{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&smoothoperatorv1.OwnerInfo{}, builder.WithPredicates(predicate.GenerationChangedPredicate{}))
+
+	return controllerMgr.Watches(&appsv1.ReplicaSet{}, smoothoperatorstatus.GetReplicaSetEventHandlerForObj(mgr, obj))
 }
 
 func ttlExpired[O pdoknlv3.WMSWFS](obj O) bool {

internal/controller/status.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"context"
+	smoothoperatorstatus "github.com/pdok/smooth-operator/pkg/status"
 	"time"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -71,6 +72,13 @@ func updateStatus[R Reconciler](ctx context.Context, r R, obj client.Object, con
 		status = &any(obj).(*pdoknlv3.WMS).Status
 	}
 
+	ps, err := smoothoperatorstatus.GetPodSummary(ctx, obj)
+	if err != nil {
+		lgr.Error(err, "unable to get pod summary for status update")
+		return
+	}
+	status.PodSummary = ps
+
 	changed := false
 	for _, condition := range conditions {
 		if meta.SetStatusCondition(&status.Conditions, condition) {

internal/controller/wfs_controller.go

@@ -26,7 +26,6 @@ package controller
 
 import (
 	"context"
-
 	"github.com/pdok/mapserver-operator/internal/controller/types"
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
@@ -131,5 +130,5 @@ func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *WFSReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return setWatches(ctrl.NewControllerManagedBy(mgr).For(&pdoknlv3.WFS{}).Named("wfs")).Complete(r)
+	return createControllerManager(mgr, &pdoknlv3.WFS{}).Complete(r)
 }

internal/controller/wms_controller.go

@@ -212,5 +212,5 @@ func mutateConfigMapOgcWebserviceProxy(r *WMSReconciler, wms *pdoknlv3.WMS, conf
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *WMSReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return setWatches(ctrl.NewControllerManagedBy(mgr).For(&pdoknlv3.WMS{}).Named("wms")).Complete(r)
+	return createControllerManager(mgr, &pdoknlv3.WMS{}).Complete(r)
 }