Skip to content

Commit 5fc5fc0

Browse files
author
Jelle Dijkstra
committed
Smooth-operator version
1 parent 30cf806 commit 5fc5fc0

File tree

8 files changed

+21
-27
lines changed

8 files changed

+21
-27
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

6-
COPY --from=repos ./smooth-operator /smooth-operator
6+
#COPY --from=repos ./smooth-operator /smooth-operator
77

88
WORKDIR /workspace
99
# Copy the Go Modules manifests

‎go.mod‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/pdok/featureinfo-generator v1.4.0-beta1
1414
github.com/pdok/ogc-capabilities-generator v1.0.0-beta6
1515
github.com/pdok/ogc-specifications v1.0.0-beta5
16-
github.com/pdok/smooth-operator v0.0.14
16+
github.com/pdok/smooth-operator v0.0.16
1717
github.com/stretchr/testify v1.10.0
1818
github.com/traefik/traefik/v3 v3.3.4
1919
k8s.io/api v0.32.3
@@ -23,10 +23,7 @@ require (
2323
sigs.k8s.io/yaml v1.4.0
2424
)
2525

26-
replace (
27-
github.com/abbot/go-http-auth => github.com/abbot/go-http-auth v0.4.0 // for github.com/traefik/traefik/v3
28-
github.com/pdok/smooth-operator => ../smooth-operator
29-
)
26+
replace github.com/abbot/go-http-auth => github.com/abbot/go-http-auth v0.4.0 // for github.com/traefik/traefik/v3
3027

3128
require (
3229
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
@@ -35,7 +32,6 @@ require (
3532
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
3633
github.com/go-kit/log v0.2.1 // indirect
3734
github.com/go-logfmt/logfmt v0.5.1 // indirect
38-
github.com/goccy/go-yaml v1.15.6 // indirect
3935
github.com/google/go-github/v28 v28.1.1 // indirect
4036
github.com/google/go-querystring v1.1.0 // indirect
4137
github.com/gorilla/mux v1.8.1 // indirect
@@ -49,7 +45,6 @@ require (
4945
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5046
github.com/rogpeppe/go-internal v1.14.1 // indirect
5147
github.com/rs/zerolog v1.33.0 // indirect
52-
github.com/sters/yaml-diff v1.4.1 // indirect
5348
github.com/traefik/paerser v0.2.2 // indirect
5449
github.com/unrolled/render v1.0.2 // indirect
5550
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr
6666
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
6767
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
6868
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
69-
github.com/goccy/go-yaml v1.15.6 h1:gy5kf1yjMia3/c3wWD+u1z3lU5XlhpT8FZGaLJU9cOA=
70-
github.com/goccy/go-yaml v1.15.6/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
7169
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
7270
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
7371
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -155,6 +153,8 @@ github.com/pdok/ogc-capabilities-generator v1.0.0-beta6 h1:yn0ZyMruJ2gmdx7E78LEa
155153
github.com/pdok/ogc-capabilities-generator v1.0.0-beta6/go.mod h1:slk89sAgmWU5NCIKwGyciQWnm0RHmwhJYQ431E2CwSk=
156154
github.com/pdok/ogc-specifications v1.0.0-beta5 h1:j7JrXUeW55mVU9ZmJ67r8V6DhbKdgTDiGE1YKFpRWx4=
157155
github.com/pdok/ogc-specifications v1.0.0-beta5/go.mod h1:YDngwkwrWOfc5MYnEYseiv97K1Y9bZXlVzwi/8EaIl8=
156+
github.com/pdok/smooth-operator v0.0.16 h1:1vurI2TPDHmTaTu0YeG1B9mIIa5MT6GPWhixiZ/styg=
157+
github.com/pdok/smooth-operator v0.0.16/go.mod h1:ohDqrUnmS7wK8TrNHJnFS/mDgf26Yhb8mtRBX3ixdr4=
158158
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
159159
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
160160
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -178,8 +178,6 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
178178
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
179179
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
180180
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
181-
github.com/sters/yaml-diff v1.4.1 h1:0W3jnFKCu8/DV7nh2aXSDA2VVfxfHu2+qdh81CuFmZo=
182-
github.com/sters/yaml-diff v1.4.1/go.mod h1:K286Xp2z+aGkok7z9k3zXcq0ZsrDaDp7/wyGwFjM9Y8=
183181
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
184182
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
185183
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

‎internal/controller/capabilitiesgenerator/capabilities_generator_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -635,13 +635,13 @@ func TestGetInputForWFS(t *testing.T) {
635635
},
636636
ownerInfo: &smoothoperatorv1.OwnerInfo{
637637
Spec: smoothoperatorv1.OwnerInfoSpec{
638-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
639-
MetadataUrls: smoothoperatorv1.MetadataUrls{
640-
CSW: smoothoperatorv1.MetadataURL{
638+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
639+
MetadataUrls: &smoothoperatorv1.MetadataUrls{
640+
CSW: &smoothoperatorv1.MetadataURL{
641641
HrefTemplate: "https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id={{identifier}}",
642642
},
643643
},
644-
WFS: smoothoperatorv1.WFS{
644+
WFS: &smoothoperatorv1.WFS{
645645
ServiceProvider: smoothoperatorv1.ServiceProvider{
646646
ProviderName: smoothoperatorutils.Pointer("PDOK"),
647647
},
@@ -683,14 +683,14 @@ func TestInputForWMS(t *testing.T) {
683683

684684
ownerInfo := smoothoperatorv1.OwnerInfo{
685685
Spec: smoothoperatorv1.OwnerInfoSpec{
686-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
687-
MetadataUrls: smoothoperatorv1.MetadataUrls{
688-
CSW: smoothoperatorv1.MetadataURL{
686+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
687+
MetadataUrls: &smoothoperatorv1.MetadataUrls{
688+
CSW: &smoothoperatorv1.MetadataURL{
689689
HrefTemplate: "https://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?service=CSW&version=2.0.2&request=GetRecordById&outputschema=http://www.isotc211.org/2005/gmd&elementsetname=full&id={{identifier}}",
690690
},
691691
},
692-
WMS: smoothoperatorv1.WMS{
693-
ContactInformation: &smoothoperatorv1.ContactInformation{
692+
WMS: &smoothoperatorv1.WMS{
693+
ContactInformation: smoothoperatorv1.ContactInformation{
694694
ContactPersonPrimary: &contactPersonPrimary,
695695
ContactPosition: asPtr("pointOfContact"),
696696
ContactAddress: &smoothoperatorv1.ContactAddress{

‎internal/controller/mapfilegenerator/mapfile_generator_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const (
2525
"service_metadata_id": "metameta-meta-meta-meta-metametameta",
2626
"automatic_casing": true,
2727
"data_epsg": "EPSG:28992",
28+
"service_debug_level": 0,
2829
"epsg_list": [
2930
"EPSG:28992",
3031
"EPSG:25831",
@@ -211,7 +212,7 @@ func TestGetConfigForWFS(t *testing.T) {
211212
},
212213
ownerInfo: &smoothoperatorv1.OwnerInfo{
213214
Spec: smoothoperatorv1.OwnerInfoSpec{
214-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
215+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
215216
},
216217
},
217218
},

‎internal/controller/shared_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424

2525
func getHashedConfigMapNameFromClient[O pdoknlv3.WMSWFS](ctx context.Context, obj O, volumeName string) (string, error) {
2626
deployment := &appsv1.Deployment{}
27-
err := k8sClient.Get(ctx, types.NamespacedName{Namespace: namespace, Name: getBareDeployment(obj, MapserverName).GetName()}, deployment)
27+
err := k8sClient.Get(ctx, types.NamespacedName{Namespace: namespace, Name: getBareDeployment(obj).GetName()}, deployment)
2828
if err != nil {
2929
return "", err
3030
}

‎internal/controller/wfs_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ var _ = Describe("WFS Controller", func() {
177177
reconcileWFS(controllerReconciler, wfs, typeNamespacedNameWfs)
178178

179179
By("Getting the original Deployment")
180-
deployment := getBareDeployment(wfs, MapserverName)
180+
deployment := getBareDeployment(wfs)
181181
Eventually(func() bool {
182182
err := k8sClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)
183183
return Expect(err).NotTo(HaveOccurred())
@@ -215,7 +215,7 @@ var _ = Describe("WFS Controller", func() {
215215
By("Reconciling the WFS and checking the deployment")
216216
reconcileWFS(controllerReconciler, wfs, typeNamespacedNameWfs)
217217

218-
deployment := getBareDeployment(wfs, MapserverName)
218+
deployment := getBareDeployment(wfs)
219219
Eventually(func() bool {
220220
err := k8sClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)
221221
return Expect(err).NotTo(HaveOccurred())

‎internal/controller/wms_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ var _ = Describe("WMS Controller", func() {
174174
reconcileWMS(controllerReconciler, wms, typeNamespacedNameWms)
175175

176176
By("Getting the original Deployment")
177-
deployment := getBareDeployment(wms, MapserverName)
177+
deployment := getBareDeployment(wms)
178178
Eventually(func() bool {
179179
err := k8sClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)
180180
return Expect(err).NotTo(HaveOccurred())
@@ -211,7 +211,7 @@ var _ = Describe("WMS Controller", func() {
211211
By("Reconciling the WMS and checking the deployment")
212212
reconcileWMS(controllerReconciler, wms, typeNamespacedNameWms)
213213

214-
deployment := getBareDeployment(wms, MapserverName)
214+
deployment := getBareDeployment(wms)
215215
Eventually(func() bool {
216216
err := k8sClient.Get(ctx, client.ObjectKeyFromObject(deployment), deployment)
217217
return Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)