Merge pull request #86 from PDOK/jd/panic-recover

Panic recovery + label prefixes

Author: jelledijkstra97

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/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml

@@ -100,10 +100,10 @@ immutable: true
 kind: ConfigMap
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml

@@ -172,10 +172,10 @@ immutable: true
 kind: ConfigMap
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml

@@ -104,10 +104,10 @@ immutable: true
 kind: ConfigMap
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml

@@ -123,10 +123,10 @@ immutable: true
 kind: ConfigMap
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/deployment.yaml

@@ -2,10 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme
@@ -22,10 +22,10 @@ spec:
   revisionHistoryLimit: 1
   selector:
     matchLabels:
-      app: mapserver
+      pdok.nl/app: mapserver
       dataset: dataset
       dataset-owner: datasetOwner
-      inspire: true
+      pdok.nl/inspire: true
       service-type: wfs
       service-version: v1_0
       theme: theme
@@ -45,10 +45,10 @@ spec:
         priority.version-checker.io/mapserver: "4"
         priority.version-checker.io/ogc-webservice-proxy: "4"
       labels:
-        app: mapserver
+        pdok.nl/app: mapserver
         dataset: dataset
         dataset-owner: datasetOwner
-        inspire: true
+        pdok.nl/inspire: true
         service-type: wfs
         service-version: v1_0
         theme: theme

internal/controller/test_data/wfs/complete/expected/horizontalpodautoscaler.yaml

@@ -2,10 +2,10 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/ingressroute.yaml

@@ -2,10 +2,10 @@ apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/middleware-headers.yaml

@@ -2,10 +2,10 @@ apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme

internal/controller/test_data/wfs/complete/expected/poddisruptionbudget.yaml

@@ -2,10 +2,10 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-    app: mapserver
+    pdok.nl/app: mapserver
     dataset: dataset
     dataset-owner: datasetOwner
-    inspire: true
+    pdok.nl/inspire: true
     service-type: wfs
     service-version: v1_0
     theme: theme
@@ -22,10 +22,10 @@ spec:
   maxUnavailable: 1
   selector:
     matchLabels:
-      app: mapserver
+      pdok.nl/app: mapserver
       dataset: dataset
       dataset-owner: datasetOwner
-      inspire: true
+      pdok.nl/inspire: true
       service-type: wfs
       service-version: v1_0
       theme: theme