Skip to content

Commit c32fe7e

Browse files
author
Jelle Dijkstra
committed
Do not read datasetOwner label
1 parent 51af144 commit c32fe7e

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

internal/controller/mapfilegenerator/mapper.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,12 @@ func getGeopackagePath(data pdoknlv3.Data) *string {
147147
func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv1.OwnerInfo) (WMSInput, error) {
148148
service := wms.Spec.Service
149149

150-
datasetOwner := ""
151-
if service.Layer.Authority != nil {
152-
datasetOwner = service.Layer.Authority.Name
153-
} else {
154-
datasetOwner = wms.ObjectMeta.Labels["dataset-owner"]
155-
}
156-
157150
authority := wms.GetAuthority()
158151
authorityURL := ""
152+
datasetOwner := ""
159153
if authority != nil {
160154
authorityURL = authority.URL
155+
datasetOwner = authority.Name
161156
}
162157

163158
box := service.GetBoundingBox()

internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapfile-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ metadata:
107107
inspire: "false"
108108
service-type: wms
109109
service-version: v1_0
110-
name: custom-mapfile-wms-mapfile-generator-gbcm54mbtm
110+
name: custom-mapfile-wms-mapfile-generator-kg99hgf8dg
111111
namespace: default
112112
ownerReferences:
113113
- apiVersion: pdok.nl/v3

internal/controller/test_data/wms/minimal/expected/configmap-mapfile-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ metadata:
107107
inspire: "false"
108108
service-type: wms
109109
service-version: v1_0
110-
name: minimal-wms-mapfile-generator-gbcm54mbtm
110+
name: minimal-wms-mapfile-generator-kg99hgf8dg
111111
namespace: default
112112
ownerReferences:
113113
- apiVersion: pdok.nl/v3

internal/controller/test_data/wms/minimal/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ spec:
346346
defaultMode: 420
347347
name: capabilities-generator-config
348348
- configMap:
349-
name: minimal-wms-mapfile-generator-gbcm54mbtm
349+
name: minimal-wms-mapfile-generator-kg99hgf8dg
350350
defaultMode: 420
351351
name: mapfile-generator-config
352352
- name: styling-files

internal/controller/test_data/wms/noprefetch/expected/configmap-mapfile-generator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ metadata:
107107
inspire: "false"
108108
service-type: wms
109109
service-version: v1_0
110-
name: noprefetch-wms-mapfile-generator-6t4mtcf926
110+
name: noprefetch-wms-mapfile-generator-m826f48hc8
111111
namespace: default
112112
ownerReferences:
113113
- apiVersion: pdok.nl/v3

internal/controller/test_data/wms/noprefetch/expected/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ spec:
338338
defaultMode: 420
339339
name: capabilities-generator-config
340340
- configMap:
341-
name: noprefetch-wms-mapfile-generator-6t4mtcf926
341+
name: noprefetch-wms-mapfile-generator-m826f48hc8
342342
defaultMode: 420
343343
name: mapfile-generator-config
344344
- name: styling-files

0 commit comments

Comments
 (0)