Panic recovery and label prefixes

Author: Jelle Dijkstra

internal/controller/shared_controller.go

@@ -6,6 +6,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/pdok/smooth-operator/model"
@@ -21,7 +23,8 @@ import (
 )
 
 const (
-	AppLabelKey = "app"
+	AppLabelKey     = "pdok.nl/app"
+	InspireLabelKey = "pdok.nl/inspire"
 )
 
 func ttlExpired[O pdoknlv3.WMSWFS](obj O) bool {
@@ -68,7 +71,7 @@ func addCommonLabels[O pdoknlv3.WMSWFS](obj O, labels map[string]string) map[str
 		inspire = any(obj).(*pdoknlv3.WMS).Spec.Service.Inspire != nil
 	}
 
-	labels["inspire"] = strconv.FormatBool(inspire)
+	labels[InspireLabelKey] = strconv.FormatBool(inspire)
 
 	return labels
 }
@@ -249,3 +252,20 @@ func createOrUpdateOrDeletePodDisruptionBudget[O pdoknlv3.WMSWFS, R Reconciler](
 	}
 	return nil
 }
+
+func recoveredPanicToError(rec any) (err error) {
+	switch x := rec.(type) {
+	case string:
+		err = errors.New(x)
+	case error:
+		err = x
+	default:
+		err = errors.New("unknown panic")
+	}
+
+	// Add stack
+	// TODO - this doesn't seem to work, see if there is a better method to add the stack
+	err = errors.WithStack(err)
+
+	return
+}

internal/controller/wfs_controller.go

@@ -99,6 +99,14 @@ func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 		return result, err
 	}
 
+	// Recover from a panic so we can add the error to the status of the Atom
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = recoveredPanicToError(rec)
+			logAndUpdateStatusError(ctx, r, wfs, err)
+		}
+	}()
+
 	// Check TTL, delete if expired
 	if ttlExpired(wfs) {
 		err = r.Client.Delete(ctx, wfs)

internal/controller/wms_controller.go

@@ -110,6 +110,14 @@ func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 		return result, client.IgnoreNotFound(err)
 	}
 
+	// Recover from a panic so we can add the error to the status of the Atom
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = recoveredPanicToError(rec)
+			logAndUpdateStatusError(ctx, r, wms, err)
+		}
+	}()
+
 	// Check TTL, delete if expired
 	if ttlExpired(wms) {
 		err = r.Client.Delete(ctx, wms)