diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go index 27305ee..1643ad1 100644 --- a/internal/controller/shared_controller.go +++ b/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 +} diff --git a/internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml index 6ff52b5..1ba73ec 100644 --- a/internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml index d6223c8..ad70452 100644 --- a/internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml index 2a0d152..3c73fd1 100644 --- a/internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml index b635a19..c914be6 100644 --- a/internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/deployment.yaml b/internal/controller/test_data/wfs/complete/expected/deployment.yaml index ef5e355..9ceaf94 100644 --- a/internal/controller/test_data/wfs/complete/expected/deployment.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wfs/complete/expected/horizontalpodautoscaler.yaml index ff4063e..614eb9f 100644 --- a/internal/controller/test_data/wfs/complete/expected/horizontalpodautoscaler.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/ingressroute.yaml b/internal/controller/test_data/wfs/complete/expected/ingressroute.yaml index a44a5d8..6e9192d 100644 --- a/internal/controller/test_data/wfs/complete/expected/ingressroute.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/middleware-headers.yaml b/internal/controller/test_data/wfs/complete/expected/middleware-headers.yaml index ee49748..46e387c 100644 --- a/internal/controller/test_data/wfs/complete/expected/middleware-headers.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wfs/complete/expected/poddisruptionbudget.yaml index eddaebf..7a2f186 100644 --- a/internal/controller/test_data/wfs/complete/expected/poddisruptionbudget.yaml +++ b/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 diff --git a/internal/controller/test_data/wfs/complete/expected/service.yaml b/internal/controller/test_data/wfs/complete/expected/service.yaml index ad9f4f1..6a8ac84 100644 --- a/internal/controller/test_data/wfs/complete/expected/service.yaml +++ b/internal/controller/test_data/wfs/complete/expected/service.yaml @@ -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 @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml index 2e1925c..06e9df3 100644 --- a/internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml index 0d59de9..3563e0f 100644 --- a/internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml index 392ba8e..8561ec7 100644 --- a/internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml index 3fdae24..257a1eb 100644 --- a/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/deployment.yaml b/internal/controller/test_data/wfs/minimal/expected/deployment.yaml index 8d768af..219f414 100644 --- a/internal/controller/test_data/wfs/minimal/expected/deployment.yaml +++ b/internal/controller/test_data/wfs/minimal/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: minimal-wfs-mapserver @@ -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: @@ -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: diff --git a/internal/controller/test_data/wfs/minimal/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wfs/minimal/expected/horizontalpodautoscaler.yaml index f72fb8e..c35c146 100644 --- a/internal/controller/test_data/wfs/minimal/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/horizontalpodautoscaler.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/ingressroute.yaml b/internal/controller/test_data/wfs/minimal/expected/ingressroute.yaml index 52ebb2e..7affcb3 100644 --- a/internal/controller/test_data/wfs/minimal/expected/ingressroute.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/ingressroute.yaml @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/middleware-headers.yaml b/internal/controller/test_data/wfs/minimal/expected/middleware-headers.yaml index 28c262a..adab435 100644 --- a/internal/controller/test_data/wfs/minimal/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wfs/minimal/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: minimal-wfs-mapserver-headers diff --git a/internal/controller/test_data/wfs/minimal/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wfs/minimal/expected/poddisruptionbudget.yaml index 03b8b2b..58f36f4 100644 --- a/internal/controller/test_data/wfs/minimal/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wfs/minimal/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: minimal-wfs-mapserver @@ -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 diff --git a/internal/controller/test_data/wfs/minimal/expected/service.yaml b/internal/controller/test_data/wfs/minimal/expected/service.yaml index bdb9d1a..342df3f 100644 --- a/internal/controller/test_data/wfs/minimal/expected/service.yaml +++ b/internal/controller/test_data/wfs/minimal/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service 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 @@ -32,9 +32,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wfs service-version: v1_0 diff --git a/internal/controller/test_data/wfs/noprefetch/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wfs/noprefetch/expected/configmap-capabilities-generator.yaml index 4e91d00..a71408f 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/configmap-capabilities-generator.yaml @@ -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: noprefetch-wfs-capabilities-generator-tk7t48fd89 diff --git a/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapfile-generator.yaml index 67b46fc..ba96f74 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapfile-generator.yaml @@ -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: noprefetch-wfs-mapfile-generator-g82gh74ddd diff --git a/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml index 4a23c58..7e60e4d 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml @@ -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: noprefetch-wfs-mapserver-49t5fd5c5d diff --git a/internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml b/internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml index d714f19..5b1a8d0 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml +++ b/internal/controller/test_data/wfs/noprefetch/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: noprefetch-wfs-mapserver @@ -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: @@ -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: diff --git a/internal/controller/test_data/wfs/noprefetch/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wfs/noprefetch/expected/horizontalpodautoscaler.yaml index a08889c..1543321 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/horizontalpodautoscaler.yaml @@ -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: noprefetch-wfs-mapserver diff --git a/internal/controller/test_data/wfs/noprefetch/expected/ingressroute.yaml b/internal/controller/test_data/wfs/noprefetch/expected/ingressroute.yaml index 7b52605..7b43d28 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/ingressroute.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/ingressroute.yaml @@ -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: noprefetch-wfs-mapserver diff --git a/internal/controller/test_data/wfs/noprefetch/expected/middleware-headers.yaml b/internal/controller/test_data/wfs/noprefetch/expected/middleware-headers.yaml index 6c302fa..058beed 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wfs/noprefetch/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: noprefetch-wfs-mapserver-headers diff --git a/internal/controller/test_data/wfs/noprefetch/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wfs/noprefetch/expected/poddisruptionbudget.yaml index e95fa25..d437eda 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wfs/noprefetch/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: 'false' + pdok.nl/inspire: 'false' service-type: wfs service-version: v1_0 name: noprefetch-wfs-mapserver @@ -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 diff --git a/internal/controller/test_data/wfs/noprefetch/expected/service.yaml b/internal/controller/test_data/wfs/noprefetch/expected/service.yaml index 9e34c3c..7e2675a 100644 --- a/internal/controller/test_data/wfs/noprefetch/expected/service.yaml +++ b/internal/controller/test_data/wfs/noprefetch/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service 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: noprefetch-wfs-mapserver @@ -32,9 +32,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wfs service-version: v1_0 diff --git a/internal/controller/test_data/wms/complete/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wms/complete/expected/configmap-capabilities-generator.yaml index acd4844..8e1da8d 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-capabilities-generator.yaml @@ -226,10 +226,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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/configmap-featureinfo-generator.yaml b/internal/controller/test_data/wms/complete/expected/configmap-featureinfo-generator.yaml index 209493b..6880d7b 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-featureinfo-generator.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-featureinfo-generator.yaml @@ -54,10 +54,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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wms/complete/expected/configmap-init-scripts.yaml index 6a25bd8..51abcc2 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-init-scripts.yaml +++ b/internal/controller/test_data/wms/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: wms service-version: v1_0 theme: "2016" diff --git a/internal/controller/test_data/wms/complete/expected/configmap-legend-generator.yaml b/internal/controller/test_data/wms/complete/expected/configmap-legend-generator.yaml index ab1ad53..86cb48a 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-legend-generator.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-legend-generator.yaml @@ -68,10 +68,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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wms/complete/expected/configmap-mapfile-generator.yaml index f971c0a..1d192f7 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-mapfile-generator.yaml @@ -161,10 +161,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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml index 447bc8f..4252736 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml @@ -129,10 +129,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: wms service-version: v1_0 theme: "2016" diff --git a/internal/controller/test_data/wms/complete/expected/configmap-ogc-webservice-proxy.yaml b/internal/controller/test_data/wms/complete/expected/configmap-ogc-webservice-proxy.yaml index becd3ab..06d367d 100644 --- a/internal/controller/test_data/wms/complete/expected/configmap-ogc-webservice-proxy.yaml +++ b/internal/controller/test_data/wms/complete/expected/configmap-ogc-webservice-proxy.yaml @@ -14,10 +14,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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/deployment.yaml b/internal/controller/test_data/wms/complete/expected/deployment.yaml index 1fe7d2c..fac0302 100644 --- a/internal/controller/test_data/wms/complete/expected/deployment.yaml +++ b/internal/controller/test_data/wms/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: wms service-version: v1_0 theme: '2016' @@ -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: wms service-version: v1_0 theme: '2016' @@ -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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wms/complete/expected/horizontalpodautoscaler.yaml index 94c115a..bfd17e6 100644 --- a/internal/controller/test_data/wms/complete/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wms/complete/expected/horizontalpodautoscaler.yaml @@ -3,10 +3,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: wms service-version: v1_0 theme: "2016" diff --git a/internal/controller/test_data/wms/complete/expected/ingressroute.yaml b/internal/controller/test_data/wms/complete/expected/ingressroute.yaml index 17a0759..ab4ed9b 100644 --- a/internal/controller/test_data/wms/complete/expected/ingressroute.yaml +++ b/internal/controller/test_data/wms/complete/expected/ingressroute.yaml @@ -3,10 +3,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: wms service-version: v1_0 theme: "2016" diff --git a/internal/controller/test_data/wms/complete/expected/middleware-headers.yaml b/internal/controller/test_data/wms/complete/expected/middleware-headers.yaml index fa53307..1587754 100644 --- a/internal/controller/test_data/wms/complete/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wms/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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wms/complete/expected/poddisruptionbudget.yaml index f2d20ca..babbc52 100644 --- a/internal/controller/test_data/wms/complete/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wms/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: wms service-version: v1_0 theme: '2016' @@ -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: wms service-version: v1_0 theme: '2016' diff --git a/internal/controller/test_data/wms/complete/expected/service.yaml b/internal/controller/test_data/wms/complete/expected/service.yaml index 0e482db..9aa1fcf 100644 --- a/internal/controller/test_data/wms/complete/expected/service.yaml +++ b/internal/controller/test_data/wms/complete/expected/service.yaml @@ -3,10 +3,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: wms service-version: v1_0 theme: "2016" @@ -35,10 +35,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: wms service-version: v1_0 theme: "2016" diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-capabilities-generator.yaml index 75a1321..5265701 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-capabilities-generator.yaml @@ -133,10 +133,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: wms service-version: v1_0 name: custom-mapfile-wms-capabilities-generator-745hbmh8kd diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-featureinfo-generator.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-featureinfo-generator.yaml index 592a7b8..c52c3e1 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-featureinfo-generator.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-featureinfo-generator.yaml @@ -35,10 +35,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: wms service-version: v1_0 name: custom-mapfile-wms-featureinfo-generator-668mmh48cc diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-init-scripts.yaml index 3706619..bb9ca94 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-init-scripts.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: custom-mapfile-wms-init-scripts-fft29bbtdd diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-legend-generator.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-legend-generator.yaml index 1e99e14..2530012 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-legend-generator.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-legend-generator.yaml @@ -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: wms service-version: v1_0 name: custom-mapfile-wms-legend-generator-82hh8mg962 diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml index 3259c26..3e48b05 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml @@ -129,10 +129,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: wms service-version: v1_0 name: custom-mapfile-wms-mapserver-thkgc6d66b diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-ogc-webservice-proxy.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-ogc-webservice-proxy.yaml index 98c65da..a4389cf 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-ogc-webservice-proxy.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-ogc-webservice-proxy.yaml @@ -14,10 +14,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: wms service-version: v1_0 name: custom-mapfile-wms-ogc-webservice-proxy-22tb5878f7 diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml index f0ec37c..d449507 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml @@ -3,10 +3,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: wms service-version: v1_0 name: custom-mapfile-wms-mapserver @@ -22,10 +22,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: wms service-version: v1_0 strategy: @@ -44,10 +44,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: wms service-version: v1_0 spec: diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/horizontalpodautoscaler.yaml index 92cd702..10ebb09 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/horizontalpodautoscaler.yaml @@ -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: wms service-version: v1_0 name: custom-mapfile-wms-mapserver diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/ingressroute.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/ingressroute.yaml index 1fd7827..d173bd8 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/ingressroute.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: custom-mapfile-wms-mapserver diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/middleware-headers.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/middleware-headers.yaml index 6961684..8537578 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: custom-mapfile-wms-mapserver-headers diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/poddisruptionbudget.yaml index 5723dc7..ee088dc 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: custom-mapfile-wms-mapserver @@ -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: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/service.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/service.yaml index 5c11d54..2afea5a 100644 --- a/internal/controller/test_data/wms/custom-mapfile/expected/service.yaml +++ b/internal/controller/test_data/wms/custom-mapfile/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service metadata: labels: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: custom-mapfile-wms-mapserver @@ -34,9 +34,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-capabilities-generator.yaml index 0bad664..cf4f294 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-capabilities-generator.yaml @@ -133,10 +133,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: wms service-version: v1_0 name: minimal-wms-capabilities-generator-745hbmh8kd diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-featureinfo-generator.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-featureinfo-generator.yaml index 845cbac..c1ed8a3 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-featureinfo-generator.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-featureinfo-generator.yaml @@ -35,10 +35,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: wms service-version: v1_0 name: minimal-wms-featureinfo-generator-668mmh48cc diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-init-scripts.yaml index b3bc288..377c8d4 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-init-scripts.yaml +++ b/internal/controller/test_data/wms/minimal/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: minimal-wms-init-scripts-fft29bbtdd diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-legend-generator.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-legend-generator.yaml index 73b37bf..e3f270a 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-legend-generator.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-legend-generator.yaml @@ -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: wms service-version: v1_0 name: minimal-wms-legend-generator-82hh8mg962 diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml index 2b67165..2ac7b68 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml @@ -101,10 +101,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: wms service-version: v1_0 name: minimal-wms-mapfile-generator-hkt264tk5b diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml index d8a9877..fee3f2b 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml @@ -129,10 +129,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: wms service-version: v1_0 name: minimal-wms-mapserver-thkgc6d66b diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-ogc-webservice-proxy.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-ogc-webservice-proxy.yaml index 0b643f7..f316d4a 100644 --- a/internal/controller/test_data/wms/minimal/expected/configmap-ogc-webservice-proxy.yaml +++ b/internal/controller/test_data/wms/minimal/expected/configmap-ogc-webservice-proxy.yaml @@ -14,10 +14,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: wms service-version: v1_0 name: minimal-wms-ogc-webservice-proxy-22tb5878f7 diff --git a/internal/controller/test_data/wms/minimal/expected/deployment.yaml b/internal/controller/test_data/wms/minimal/expected/deployment.yaml index 96b3f92..dbb5a97 100644 --- a/internal/controller/test_data/wms/minimal/expected/deployment.yaml +++ b/internal/controller/test_data/wms/minimal/expected/deployment.yaml @@ -3,10 +3,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: wms service-version: v1_0 name: minimal-wms-mapserver @@ -22,10 +22,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: wms service-version: v1_0 strategy: @@ -44,10 +44,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: wms service-version: v1_0 spec: diff --git a/internal/controller/test_data/wms/minimal/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wms/minimal/expected/horizontalpodautoscaler.yaml index 0e4f0d0..fbe9c3e 100644 --- a/internal/controller/test_data/wms/minimal/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wms/minimal/expected/horizontalpodautoscaler.yaml @@ -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: wms service-version: v1_0 name: minimal-wms-mapserver diff --git a/internal/controller/test_data/wms/minimal/expected/ingressroute.yaml b/internal/controller/test_data/wms/minimal/expected/ingressroute.yaml index c6a8ea6..b5d8919 100644 --- a/internal/controller/test_data/wms/minimal/expected/ingressroute.yaml +++ b/internal/controller/test_data/wms/minimal/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: minimal-wms-mapserver diff --git a/internal/controller/test_data/wms/minimal/expected/middleware-headers.yaml b/internal/controller/test_data/wms/minimal/expected/middleware-headers.yaml index 094fef5..f6642f1 100644 --- a/internal/controller/test_data/wms/minimal/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wms/minimal/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: minimal-wms-mapserver-headers diff --git a/internal/controller/test_data/wms/minimal/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wms/minimal/expected/poddisruptionbudget.yaml index 407a394..8a5fe6d 100644 --- a/internal/controller/test_data/wms/minimal/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wms/minimal/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: minimal-wms-mapserver @@ -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: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/minimal/expected/service.yaml b/internal/controller/test_data/wms/minimal/expected/service.yaml index 5629fe0..33b6fc8 100644 --- a/internal/controller/test_data/wms/minimal/expected/service.yaml +++ b/internal/controller/test_data/wms/minimal/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service metadata: labels: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: minimal-wms-mapserver @@ -34,9 +34,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-capabilities-generator.yaml index 411a680..4b10fbf 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-capabilities-generator.yaml @@ -133,10 +133,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: wms service-version: v1_0 name: noprefetch-wms-capabilities-generator-745hbmh8kd diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-featureinfo-generator.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-featureinfo-generator.yaml index 556f685..28a5456 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-featureinfo-generator.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-featureinfo-generator.yaml @@ -35,10 +35,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: wms service-version: v1_0 name: noprefetch-wms-featureinfo-generator-668mmh48cc diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-legend-generator.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-legend-generator.yaml index 28ff622..42c8d9d 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-legend-generator.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-legend-generator.yaml @@ -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: wms service-version: v1_0 name: noprefetch-wms-legend-generator-82hh8mg962 diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-mapfile-generator.yaml index 0748fd5..e135686 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-mapfile-generator.yaml @@ -101,10 +101,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: wms service-version: v1_0 name: noprefetch-wms-mapfile-generator-874tg4ghb5 diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml index f6ee3d4..42ead29 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml @@ -129,10 +129,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: wms service-version: v1_0 name: noprefetch-wms-mapserver-thkgc6d66b diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-ogc-webservice-proxy.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-ogc-webservice-proxy.yaml index 46726ad..93e5711 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/configmap-ogc-webservice-proxy.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/configmap-ogc-webservice-proxy.yaml @@ -14,10 +14,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: wms service-version: v1_0 name: noprefetch-wms-ogc-webservice-proxy-22tb5878f7 diff --git a/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml b/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml index e564bfe..03b612d 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml @@ -3,10 +3,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: wms service-version: v1_0 name: noprefetch-wms-mapserver @@ -22,10 +22,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: wms service-version: v1_0 strategy: @@ -44,10 +44,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: wms service-version: v1_0 spec: diff --git a/internal/controller/test_data/wms/noprefetch/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wms/noprefetch/expected/horizontalpodautoscaler.yaml index 0fd3216..d136a5a 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/horizontalpodautoscaler.yaml @@ -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: wms service-version: v1_0 name: noprefetch-wms-mapserver diff --git a/internal/controller/test_data/wms/noprefetch/expected/ingressroute.yaml b/internal/controller/test_data/wms/noprefetch/expected/ingressroute.yaml index 91111b1..feff2ba 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/ingressroute.yaml +++ b/internal/controller/test_data/wms/noprefetch/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: noprefetch-wms-mapserver diff --git a/internal/controller/test_data/wms/noprefetch/expected/middleware-headers.yaml b/internal/controller/test_data/wms/noprefetch/expected/middleware-headers.yaml index 168fd58..9f2ab12 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wms/noprefetch/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: noprefetch-wms-mapserver-headers diff --git a/internal/controller/test_data/wms/noprefetch/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wms/noprefetch/expected/poddisruptionbudget.yaml index c1157ad..e5bc079 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wms/noprefetch/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: noprefetch-wms-mapserver @@ -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: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/noprefetch/expected/service.yaml b/internal/controller/test_data/wms/noprefetch/expected/service.yaml index 1fe902e..1e4e448 100644 --- a/internal/controller/test_data/wms/noprefetch/expected/service.yaml +++ b/internal/controller/test_data/wms/noprefetch/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service metadata: labels: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: noprefetch-wms-mapserver @@ -34,9 +34,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/patches/expected/configmap-capabilities-generator.yaml b/internal/controller/test_data/wms/patches/expected/configmap-capabilities-generator.yaml index 2a19a3e..a656f78 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-capabilities-generator.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-capabilities-generator.yaml @@ -133,10 +133,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: wms service-version: v1_0 name: patches-wms-capabilities-generator-4t652g2fm9 diff --git a/internal/controller/test_data/wms/patches/expected/configmap-featureinfo-generator.yaml b/internal/controller/test_data/wms/patches/expected/configmap-featureinfo-generator.yaml index 5b2549a..99c6982 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-featureinfo-generator.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-featureinfo-generator.yaml @@ -35,10 +35,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: wms service-version: v1_0 name: patches-wms-featureinfo-generator-668mmh48cc diff --git a/internal/controller/test_data/wms/patches/expected/configmap-init-scripts.yaml b/internal/controller/test_data/wms/patches/expected/configmap-init-scripts.yaml index 3f42e19..8465891 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-init-scripts.yaml +++ b/internal/controller/test_data/wms/patches/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: patches-wms-init-scripts-fft29bbtdd diff --git a/internal/controller/test_data/wms/patches/expected/configmap-legend-generator.yaml b/internal/controller/test_data/wms/patches/expected/configmap-legend-generator.yaml index 58a910b..ae437bc 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-legend-generator.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-legend-generator.yaml @@ -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: wms service-version: v1_0 name: patches-wms-legend-generator-6cf9f5k5h5 diff --git a/internal/controller/test_data/wms/patches/expected/configmap-mapfile-generator.yaml b/internal/controller/test_data/wms/patches/expected/configmap-mapfile-generator.yaml index 6c8182e..e92dcc9 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-mapfile-generator.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-mapfile-generator.yaml @@ -101,10 +101,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: wms service-version: v1_0 name: patches-wms-mapfile-generator-kmmkm75dgk diff --git a/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml index 952ee35..2f76fbf 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml @@ -129,10 +129,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: wms service-version: v1_0 name: patches-wms-mapserver-thkgc6d66b diff --git a/internal/controller/test_data/wms/patches/expected/configmap-ogc-webservice-proxy.yaml b/internal/controller/test_data/wms/patches/expected/configmap-ogc-webservice-proxy.yaml index 975da9b..e345ad1 100644 --- a/internal/controller/test_data/wms/patches/expected/configmap-ogc-webservice-proxy.yaml +++ b/internal/controller/test_data/wms/patches/expected/configmap-ogc-webservice-proxy.yaml @@ -14,10 +14,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: wms service-version: v1_0 name: patches-wms-ogc-webservice-proxy-22tb5878f7 diff --git a/internal/controller/test_data/wms/patches/expected/deployment.yaml b/internal/controller/test_data/wms/patches/expected/deployment.yaml index c4b56ac..f78a4ef 100644 --- a/internal/controller/test_data/wms/patches/expected/deployment.yaml +++ b/internal/controller/test_data/wms/patches/expected/deployment.yaml @@ -3,10 +3,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: wms service-version: v1_0 name: patches-wms-mapserver @@ -22,10 +22,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: wms service-version: v1_0 strategy: @@ -44,10 +44,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: wms service-version: v1_0 spec: diff --git a/internal/controller/test_data/wms/patches/expected/horizontalpodautoscaler.yaml b/internal/controller/test_data/wms/patches/expected/horizontalpodautoscaler.yaml index 8e96240..7afbfaf 100644 --- a/internal/controller/test_data/wms/patches/expected/horizontalpodautoscaler.yaml +++ b/internal/controller/test_data/wms/patches/expected/horizontalpodautoscaler.yaml @@ -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: wms service-version: v1_0 name: patches-wms-mapserver diff --git a/internal/controller/test_data/wms/patches/expected/ingressroute.yaml b/internal/controller/test_data/wms/patches/expected/ingressroute.yaml index 7b24fa4..fc947f3 100644 --- a/internal/controller/test_data/wms/patches/expected/ingressroute.yaml +++ b/internal/controller/test_data/wms/patches/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: patches-wms-mapserver diff --git a/internal/controller/test_data/wms/patches/expected/middleware-headers.yaml b/internal/controller/test_data/wms/patches/expected/middleware-headers.yaml index 17781b9..0ab983f 100644 --- a/internal/controller/test_data/wms/patches/expected/middleware-headers.yaml +++ b/internal/controller/test_data/wms/patches/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: patches-wms-mapserver-headers diff --git a/internal/controller/test_data/wms/patches/expected/poddisruptionbudget.yaml b/internal/controller/test_data/wms/patches/expected/poddisruptionbudget.yaml index a28db64..33c3461 100644 --- a/internal/controller/test_data/wms/patches/expected/poddisruptionbudget.yaml +++ b/internal/controller/test_data/wms/patches/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: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: patches-wms-mapserver @@ -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: wms service-version: v1_0 diff --git a/internal/controller/test_data/wms/patches/expected/service.yaml b/internal/controller/test_data/wms/patches/expected/service.yaml index ec3275d..c873515 100644 --- a/internal/controller/test_data/wms/patches/expected/service.yaml +++ b/internal/controller/test_data/wms/patches/expected/service.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: Service metadata: labels: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 name: patches-wms-mapserver @@ -34,9 +34,9 @@ spec: targetPort: 9117 protocol: TCP selector: - app: mapserver + pdok.nl/app: mapserver dataset: dataset dataset-owner: datasetOwner - inspire: "false" + pdok.nl/inspire: "false" service-type: wms service-version: v1_0 diff --git a/internal/controller/wfs_controller.go b/internal/controller/wfs_controller.go index 8058356..0197487 100644 --- a/internal/controller/wfs_controller.go +++ b/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) diff --git a/internal/controller/wms_controller.go b/internal/controller/wms_controller.go index 38c5dab..0adadfa 100644 --- a/internal/controller/wms_controller.go +++ b/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)