Skip to content

Panic recovery + label prefixes #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jelledijkstra97 merged 2 commits into from
Jun 11, 2025
Merged

Panic recovery + label prefixes #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ae4654
Panic recovery and label prefixes
Jun 11, 2025
7a2c657
Fixed tests
Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions internal/controller/shared_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"strconv"
"time"

"github.com/pkg/errors"

"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/pdok/smooth-operator/model"
Expand All @@ -21,7 +23,8 @@ import (
)

const (
AppLabelKey = "app"
AppLabelKey = "pdok.nl/app"
InspireLabelKey = "pdok.nl/inspire"
)

func ttlExpired[O pdoknlv3.WMSWFS](obj O) bool {
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/test_data/wfs/complete/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/horizontalpodautoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/ingressroute.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/complete/expected/middleware-headers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/test_data/wfs/complete/expected/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions internal/controller/test_data/wfs/complete/expected/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v1
kind: Service
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
Expand All @@ -32,10 +32,10 @@ spec:
targetPort: 9117
protocol: TCP
selector:
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
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ immutable: true
kind: ConfigMap
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-capabilities-generator-tk7t48fd89
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ immutable: true
kind: ConfigMap
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-init-scripts-fft29bbtdd
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ immutable: true
kind: ConfigMap
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapfile-generator-g82gh74ddd
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ immutable: true
kind: ConfigMap
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: "false"
pdok.nl/inspire: "false"
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver-49t5fd5c5d
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/test_data/wfs/minimal/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver
Expand All @@ -21,10 +21,10 @@ spec:
revisionHistoryLimit: 1
selector:
matchLabels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
strategy:
Expand All @@ -43,10 +43,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: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
spec:
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/horizontalpodautoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: "false"
pdok.nl/inspire: "false"
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/ingressroute.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: "false"
pdok.nl/inspire: "false"
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/test_data/wfs/minimal/expected/middleware-headers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver-headers
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/test_data/wfs/minimal/expected/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-mapserver
Expand All @@ -21,9 +21,9 @@ spec:
maxUnavailable: 1
selector:
matchLabels:
app: mapserver
pdok.nl/app: mapserver
dataset: dataset
dataset-owner: datasetOwner
inspire: 'false'
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
Loading
Loading