From f77a0f13df01a93b030ae8e4cb06e6e9f8c489c5 Mon Sep 17 00:00:00 2001 From: Richard Kettelerij Date: Wed, 28 Aug 2024 21:06:43 +0200 Subject: [PATCH] chore(gokoala): Bump GoKoala to v0.54.1 --- cmd/main.go | 2 +- config/crd/bases/pdok.nl_ogcapis.yaml | 73 +++++++++++++-------------- go.mod | 2 +- go.sum | 4 +- 4 files changed, 40 insertions(+), 41 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index aab4c29..a781ed4 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -51,7 +51,7 @@ import ( ) const ( - defaultGokoalaImage = "docker.io/pdok/gokoala:0.54.0" + defaultGokoalaImage = "docker.io/pdok/gokoala:0.54.1" ) var ( diff --git a/config/crd/bases/pdok.nl_ogcapis.yaml b/config/crd/bases/pdok.nl_ogcapis.yaml index 61b33f5..d804ea7 100644 --- a/config/crd/bases/pdok.nl_ogcapis.yaml +++ b/config/crd/bases/pdok.nl_ogcapis.yaml @@ -777,8 +777,9 @@ spec: - description type: object supportedSrs: - description: Specifies in what projections (SRS/CRS) - the tiles are offered + description: |- + Specifies in what projections (SRS/CRS) the tiles are offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: properties: srs: @@ -809,8 +810,9 @@ spec: ID to the underlying table in the datasource. type: string tileServer: - description: Reference to the server (or object - storage) hosting the tiles + description: |- + Reference to the server (or object storage) hosting the tiles. + Note: Only marked as optional in CRD to support top-level OR collection-level tiles pattern: ^(https?://.+)|(\$\{.+\}.*) type: string tileServerPath: @@ -818,8 +820,9 @@ spec: tileserver. Defaults to the collection ID. type: string types: - description: Could be 'vector' and/or 'raster' to - indicate the types of tiles offered + description: |- + Could be 'vector' and/or 'raster' to indicate the types of tiles offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: enum: - raster @@ -880,9 +883,6 @@ spec: type: object required: - id - - supportedSrs - - tileServer - - types type: object type: array tileServer: @@ -1572,8 +1572,9 @@ spec: - description type: object supportedSrs: - description: Specifies in what projections (SRS/CRS) - the tiles are offered + description: |- + Specifies in what projections (SRS/CRS) the tiles are offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: properties: srs: @@ -1604,8 +1605,9 @@ spec: ID to the underlying table in the datasource. type: string tileServer: - description: Reference to the server (or object - storage) hosting the tiles + description: |- + Reference to the server (or object storage) hosting the tiles. + Note: Only marked as optional in CRD to support top-level OR collection-level tiles pattern: ^(https?://.+)|(\$\{.+\}.*) type: string tileServerPath: @@ -1613,8 +1615,9 @@ spec: tileserver. Defaults to the collection ID. type: string types: - description: Could be 'vector' and/or 'raster' to - indicate the types of tiles offered + description: |- + Could be 'vector' and/or 'raster' to indicate the types of tiles offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: enum: - raster @@ -1675,9 +1678,6 @@ spec: type: object required: - id - - supportedSrs - - tileServer - - types type: object type: array datasources: @@ -2893,8 +2893,9 @@ spec: - description type: object supportedSrs: - description: Specifies in what projections (SRS/CRS) - the tiles are offered + description: |- + Specifies in what projections (SRS/CRS) the tiles are offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: properties: srs: @@ -2925,8 +2926,9 @@ spec: ID to the underlying table in the datasource. type: string tileServer: - description: Reference to the server (or object - storage) hosting the tiles + description: |- + Reference to the server (or object storage) hosting the tiles. + Note: Only marked as optional in CRD to support top-level OR collection-level tiles pattern: ^(https?://.+)|(\$\{.+\}.*) type: string tileServerPath: @@ -2934,8 +2936,9 @@ spec: tileserver. Defaults to the collection ID. type: string types: - description: Could be 'vector' and/or 'raster' to - indicate the types of tiles offered + description: |- + Could be 'vector' and/or 'raster' to indicate the types of tiles offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: enum: - raster @@ -2996,14 +2999,12 @@ spec: type: object required: - id - - supportedSrs - - tileServer - - types type: object type: array supportedSrs: - description: Specifies in what projections (SRS/CRS) the - tiles are offered + description: |- + Specifies in what projections (SRS/CRS) the tiles are offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: properties: srs: @@ -3030,13 +3031,15 @@ spec: type: object type: array tileServer: - description: Reference to the server (or object storage) - hosting the tiles + description: |- + Reference to the server (or object storage) hosting the tiles. + Note: Only marked as optional in CRD to support top-level OR collection-level tiles pattern: ^(https?://.+)|(\$\{.+\}.*) type: string types: - description: Could be 'vector' and/or 'raster' to indicate - the types of tiles offered + description: |- + Could be 'vector' and/or 'raster' to indicate the types of tiles offered + Note: Only marked as optional in CRD to support top-level OR collection-level tiles items: enum: - raster @@ -3047,10 +3050,6 @@ spec: description: Optional template to the vector tiles on the tileserver. Defaults to {tms}/{z}/{x}/{y}.pbf. type: string - required: - - supportedSrs - - tileServer - - types type: object type: object resources: diff --git a/go.mod b/go.mod index 09985cf..d01baa9 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/PDOK/ogcapi-operator go 1.22.6 require ( - github.com/PDOK/gokoala v0.54.0 + github.com/PDOK/gokoala v0.54.1 github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.32.0 github.com/peterbourgon/ff v1.7.1 diff --git a/go.sum b/go.sum index a813a60..294d049 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/PDOK/gokoala v0.54.0 h1:oXKcTax3JspH0AI8xSuvIwQC6tzXzoFx4AlAQDeH5QQ= -github.com/PDOK/gokoala v0.54.0/go.mod h1:k8tlgeP1RKOB+rdIK68nNsjeeoSdFqarKIa8ySbCQq0= +github.com/PDOK/gokoala v0.54.1 h1:nk0i13435moU/UMb4AWYo1J9zBsqu84y9A1d6WIgYBc= +github.com/PDOK/gokoala v0.54.1/go.mod h1:k8tlgeP1RKOB+rdIK68nNsjeeoSdFqarKIa8ySbCQq0= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=