Merge pull request #109 from PDOK/wr/url-immutable-message

smooth-operator version bump

Author: Shalucik

config/crd/bases/pdok.nl_wfs.yaml

@@ -1082,11 +1082,11 @@ spec:
                 - messageExpression: '''ingressRouteUrls should include service.url ''+self.service.url'
                   rule: '!has(self.ingressRouteUrls) || self.ingressRouteUrls.exists_one(x, x.url == self.service.url)'
             status:
-              description: OperatorStatus defines the observed state of an Atom/WFS/WMS/....
+              description: OperatorStatus defines the observed state of an Atom/WFS/WMS/OGCAPI/...
               properties:
                 conditions:
                   description: |-
-                    Each condition contains details for one aspect of the current state of this Atom.
+                    Each condition contains details for one aspect of the current state of this CR.
                     Known .status.conditions.type are: "Reconciled"
                   items:
                     description: Condition contains details for one aspect of the current state of this API Resource.
@@ -1146,10 +1146,10 @@ spec:
                   additionalProperties:
                     description: OperationResult is the action result of a CreateOrUpdate or CreateOrPatch call.
                     type: string
-                  description: The result of creating or updating of each derived resource for this Atom.
+                  description: The result of creating or updating of each derived resource for this CR.
                   type: object
                 podSummary:
-                  description: Summary of status of pods that belong to this resource
+                  description: Summary of status of pods that belong to this CR
                   items:
                     properties:
                       available:

config/crd/bases/pdok.nl_wms.yaml

@@ -1665,11 +1665,11 @@ spec:
                 - messageExpression: '''ingressRouteUrls should include service.url ''+self.service.url'
                   rule: '!has(self.ingressRouteUrls) || self.ingressRouteUrls.exists_one(x, x.url == self.service.url)'
             status:
-              description: OperatorStatus defines the observed state of an Atom/WFS/WMS/....
+              description: OperatorStatus defines the observed state of an Atom/WFS/WMS/OGCAPI/...
               properties:
                 conditions:
                   description: |-
-                    Each condition contains details for one aspect of the current state of this Atom.
+                    Each condition contains details for one aspect of the current state of this CR.
                     Known .status.conditions.type are: "Reconciled"
                   items:
                     description: Condition contains details for one aspect of the current state of this API Resource.
@@ -1729,10 +1729,10 @@ spec:
                   additionalProperties:
                     description: OperationResult is the action result of a CreateOrUpdate or CreateOrPatch call.
                     type: string
-                  description: The result of creating or updating of each derived resource for this Atom.
+                  description: The result of creating or updating of each derived resource for this CR.
                   type: object
                 podSummary:
-                  description: Summary of status of pods that belong to this resource
+                  description: Summary of status of pods that belong to this CR
                   items:
                     properties:
                       available:

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/pdok/featureinfo-generator v1.4.0
 	github.com/pdok/ogc-capabilities-generator v1.0.1
 	github.com/pdok/ogc-specifications v1.0.0
-	github.com/pdok/smooth-operator v1.2.0
+	github.com/pdok/smooth-operator v1.2.2
 	github.com/peterbourgon/ff v1.7.1
 	github.com/stretchr/testify v1.10.0
 	github.com/traefik/traefik/v3 v3.4.1

go.sum

@@ -152,8 +152,8 @@ github.com/pdok/ogc-capabilities-generator v1.0.1 h1:7cKgdcWO4y+M9a2hW8ONhmBxGER
 github.com/pdok/ogc-capabilities-generator v1.0.1/go.mod h1:Fnq2i1X3Aufjx/ptQ34c9knw1mDMUAQt0MTBscqX0/M=
 github.com/pdok/ogc-specifications v1.0.0 h1:YqVqKwgOrPprTuRcNrFJeUuxSHOIeOSQStBcYJZUGcA=
 github.com/pdok/ogc-specifications v1.0.0/go.mod h1:YDngwkwrWOfc5MYnEYseiv97K1Y9bZXlVzwi/8EaIl8=
-github.com/pdok/smooth-operator v1.2.0 h1:KFFNsFzk16IfcHPmHkgJnmbhIIY69k7crhPft3lXih8=
-github.com/pdok/smooth-operator v1.2.0/go.mod h1:tqr/CDCXZHNzQzQVlSAnCmsPlx9tWAObsj8hg9mSSEU=
+github.com/pdok/smooth-operator v1.2.2 h1:g6wq77mbK335KMb73Hn/7LnRA8VVqtdr7hj+tjrdoiM=
+github.com/pdok/smooth-operator v1.2.2/go.mod h1:tqr/CDCXZHNzQzQVlSAnCmsPlx9tWAObsj8hg9mSSEU=
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/peterbourgon/ff v1.7.1 h1:xt1lxTG+Nr2+tFtysY7abFgPoH3Lug8CwYJMOmJRXhk=
 github.com/peterbourgon/ff v1.7.1/go.mod h1:fYI5YA+3RDqQRExmFbHnBjEeWzh9TrS8rnRpEq7XIg0=

internal/webhook/v3/wfs_webhook_test.go

@@ -365,7 +365,7 @@ var _ = Describe("WFS Webhook", func() {
 			warnings, err := validator.ValidateUpdate(ctx, oldObj, obj)
 			Expect(err).To(Equal(getValidationError(obj, field.Forbidden(
 				field.NewPath("spec").Child("service").Child("url"),
-				"is immutable",
+				"is immutable, add the old and new urls to spec.ingressRouteUrls in order to change this field",
 			))))
 			Expect(warnings).To(BeEmpty())
 		})

internal/webhook/v3/wms_webhook_test.go

@@ -568,7 +568,7 @@ var _ = Describe("WMS Webhook", func() {
 			warnings, err := validator.ValidateUpdate(ctx, oldObj, obj)
 			Expect(err).To(Equal(getValidationError(obj, field.Forbidden(
 				field.NewPath("spec").Child("service").Child("url"),
-				"is immutable",
+				"is immutable, add the old and new urls to spec.ingressRouteUrls in order to change this field",
 			))))
 			Expect(warnings).To(BeEmpty())
 		})