wip

Author: Shalucik

api/v2beta1/shared_conversion.go

@@ -75,7 +75,7 @@ func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch
 
 	return &pdoknlv3.HorizontalPodAutoscalerPatch{
 		MinReplicas: minReplicas,
-		MaxReplicas: maxReplicas,
+		MaxReplicas: &maxReplicas,
 		Metrics:     metrics,
 	}
 }
@@ -221,8 +221,10 @@ func NewV2KubernetesObject(lifecycle *smoothoperatormodel.Lifecycle, podSpecPatc
 	kub.Resources = &podSpecPatch.Containers[0].Resources
 
 	if scalingSpec != nil {
-		kub.Autoscaling = &Autoscaling{
-			MaxReplicas: smoothoperatorutils.Pointer(int(scalingSpec.MaxReplicas)),
+		kub.Autoscaling = &Autoscaling{}
+
+		if scalingSpec.MaxReplicas != nil {
+			kub.Autoscaling.MaxReplicas = smoothoperatorutils.Pointer(int(*scalingSpec.MaxReplicas))
 		}
 
 		if scalingSpec.MinReplicas != nil {

api/v2beta1/wfs_conversion.go

@@ -148,7 +148,7 @@ func convertV2FeatureTypeToV3(src FeatureType) pdoknlv3.FeatureType {
 		Title:    src.Title,
 		Abstract: src.Abstract,
 		Keywords: src.Keywords,
-		DatasetMetadataURL: pdoknlv3.MetadataURL{
+		DatasetMetadataURL: &pdoknlv3.MetadataURL{
 			CSW: &pdoknlv3.Metadata{
 				MetadataIdentifier: src.DatasetMetadataIdentifier,
 			},

api/v3/shared_types.go

@@ -23,9 +23,12 @@ const (
 
 // HorizontalPodAutoscalerPatch - copy of autoscalingv2.HorizontalPodAutoscalerSpec without ScaleTargetRef
 // This way we don't have to specify the scaleTargetRef field in the CRD.
+// +kubebuilder:validation:XValidation:rule="self.maxReplicas >= self.minReplicas", message="metadataUrl should have csw or custom, not both"
 type HorizontalPodAutoscalerPatch struct {
-	MinReplicas *int32                                         `json:"minReplicas,omitempty"`
-	MaxReplicas int32                                          `json:"maxReplicas"`
+	// +kubebuilder:default:=2
+	MinReplicas int32 `json:"minReplicas,omitempty"`
+	// +kubebuilder:default:=30
+	MaxReplicas int32                                          `json:"maxReplicas,omitempty"`
 	Metrics     []autoscalingv2.MetricSpec                     `json:"metrics,omitempty"`
 	Behavior    *autoscalingv2.HorizontalPodAutoscalerBehavior `json:"behavior,omitempty"`
 }
@@ -167,7 +170,7 @@ type Data struct {
 // +kubebuilder:validation:Type=object
 type Gpkg struct {
 	// Blobkey identifies the location/bucket of the .gpkg file
-	// +kubebuilder:validation:Pattern=`\.gpkg$`
+	// +kubebuilder:validation:Pattern:=^.+\/.+\/.+\.gpkg$
 	// +kubebuilder:validation:MinLength:=1
 	BlobKey string `json:"blobKey"`
 

api/v3/wfs_types.go

@@ -118,6 +118,7 @@ type WFSService struct {
 
 	// Keywords for capabilities
 	// +kubebuilder:validation:MinItems:=1
+	// +kubebuilder:validation:items:MinLength:=1
 	Keywords []string `json:"keywords"`
 
 	// Optional Fees
@@ -164,6 +165,8 @@ func (s WFSService) KeywordsIncludingInspireKeyword() []string {
 // HealthCheck is the struct with all fields to configure custom healthchecks
 type HealthCheckWFS struct {
 	// +kubebuilder:validation:MinLength:=1
+	// +kubebuilder:validation:XValidation:rule="self.contains('Service=WFS')",message="a valid healthcheck contains 'Service=WFS'"
+	// +kubebuilder:validation:XValidation:rule="self.contains('Request=')",message="a valid healthcheck contains 'Request='"
 	Querystring string `json:"querystring"`
 	// +kubebuilder:validation:Pattern=(image/png|text/xml|text/html)
 	Mimetype string `json:"mimetype"`
@@ -192,11 +195,12 @@ type FeatureType struct {
 
 	// Keywords of the feature
 	// +kubebuilder:validation:MinItems:=1
+	// +kubebuilder:validation:items:MinLength:=1
 	Keywords []string `json:"keywords"`
 
 	// Metadata URL
 	// +kubebuilder:validation:Type=object
-	DatasetMetadataURL MetadataURL `json:"datasetMetadataUrl"`
+	DatasetMetadataURL *MetadataURL `json:"datasetMetadataUrl,omitempty"`
 
 	// Optional feature bbox
 	// +kubebuilder:validation:Optional

api/v3/wms_types.go

@@ -90,6 +90,7 @@ type WMSService struct {
 
 	// Keywords of the service
 	// +kubebuilder:validation:MinItems:=1
+	// +kubebuilder:validation:items:MinLength:=1
 	Keywords []string `json:"keywords"`
 
 	// Reference to a CR of Kind OwnerInfo

api/v3/zz_generated.deepcopy.go

@@ -466,6 +466,11 @@ spec:
                   querystring:
                     minLength: 1
                     type: string
+                    x-kubernetes-validations:
+                    - message: a valid healthcheck contains 'Service=WFS'
+                      rule: self.contains('Service=WFS')
+                    - message: a valid healthcheck contains 'Request='
+                      rule: self.contains('Request=')
                 required:
                 - mimetype
                 - querystring
@@ -1058,8 +1063,6 @@ spec:
                   minReplicas:
                     format: int32
                     type: integer
-                required:
-                - maxReplicas
                 type: object
               lifecycle:
                 description: Optional lifecycle settings
@@ -1252,7 +1255,7 @@ spec:
                                   description: Blobkey identifies the location/bucket
                                     of the .gpkg file
                                   minLength: 1
-                                  pattern: \.gpkg$
+                                  pattern: ^.+\/.+\/.+\.gpkg$
                                   type: string
                                 columns:
                                   description: Columns to visualize for this table
@@ -1405,6 +1408,7 @@ spec:
                         keywords:
                           description: Keywords of the feature
                           items:
+                            minLength: 1
                             type: string
                           minItems: 1
                           type: array
@@ -1419,7 +1423,6 @@ spec:
                       required:
                       - abstract
                       - data
-                      - datasetMetadataUrl
                       - keywords
                       - name
                       - title
@@ -1487,6 +1490,7 @@ spec:
                   keywords:
                     description: Keywords for capabilities
                     items:
+                      minLength: 1
                       type: string
                     minItems: 1
                     type: array