Merge branch 'master' into jd/status-subresource

Author: jelledijkstra97

api/v3/shared_types.go

@@ -70,15 +70,18 @@ type Mapfile struct {
 type BaseOptions struct {
 	// IncludeIngress dictates whether to deploy an Ingress or ensure none exists.
 	// +kubebuilder:default:=true
+	// +kubebuilder:validation:Optional
 	IncludeIngress bool `json:"includeIngress"`
 
 	// AutomaticCasing enables automatic conversion from snake_case to camelCase.
 	// +kubebuilder:default:=true
+	// +kubebuilder:validation:Optional
 	AutomaticCasing bool `json:"automaticCasing"`
 
 	// Whether to prefetch data from blob storage, and store it on the local filesystem.
 	// If `false`, the data will be served directly out of blob storage
 	// +kubebuilder:default:=true
+	// +kubebuilder:validation:Optional
 	PrefetchData bool `json:"prefetchData"`
 }
 

api/v3/wms_types.go

@@ -315,18 +315,22 @@ type WMSOptions struct {
 
 	// ValidateRequests enables request validation against the service schema.
 	// +kubebuilder:default:=true
+	// +kubebuilder:validation:Optional
 	ValidateRequests bool `json:"validateRequests"`
 
 	// RewriteGroupToDataLayers merges group layers into individual data layers.
 	// +kubebuilder:default:=false
+	// +kubebuilder:validation:Optional
 	RewriteGroupToDataLayers bool `json:"rewriteGroupToDataLayers"`
 
 	// DisableWebserviceProxy disables the built-in proxy for external web services.
 	// +kubebuilder:default:=false
+	// +kubebuilder:validation:Optional
 	DisableWebserviceProxy bool `json:"disableWebserviceProxy"`
 
 	// ValidateChildStyleNameEqual ensures child style names match the parent style.
 	// +kubebuilder:default=false
+	// +kubebuilder:validation:Optional
 	ValidateChildStyleNameEqual bool `json:"validateChildStyleNameEqual"`
 }
 

config/crd/bases/pdok.nl_wfs.yaml

@@ -700,10 +700,6 @@ spec:
                         Whether to prefetch data from blob storage, and store it on the local filesystem.
                         If `false`, the data will be served directly out of blob storage
                       type: boolean
-                  required:
-                    - automaticCasing
-                    - includeIngress
-                    - prefetchData
                   type: object
                 podSpecPatch:
                   description: Strategic merge patch for the pod in the deployment. E.g. to patch the resources or add extra env vars.

config/crd/bases/pdok.nl_wms.yaml

@@ -743,14 +743,6 @@ spec:
                       default: true
                       description: ValidateRequests enables request validation against the service schema.
                       type: boolean
-                  required:
-                    - automaticCasing
-                    - disableWebserviceProxy
-                    - includeIngress
-                    - prefetchData
-                    - rewriteGroupToDataLayers
-                    - validateChildStyleNameEqual
-                    - validateRequests
                   type: object
                 podSpecPatch:
                   description: Strategic merge patch for the pod in the deployment. E.g. to patch the resources or add extra env vars.