Merge pull request #883 from fao89/minitems

Ensure required lists have one item at least
openstack-k8s-operators · May 22, 2024 · 52f5c64 · 52f5c64
2 parents 1347a01 + 965757f
commit 52f5c64
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/api/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml
@@ -59,6 +59,7 @@ spec:
               nodeSets:
                 items:
                   type: string
+                minItems: 1
                 type: array
               servicesOverride:
                 items:

diff --git a/api/bases/dataplane.openstack.org_openstackdataplaneservices.yaml b/api/bases/dataplane.openstack.org_openstackdataplaneservices.yaml
@@ -65,6 +65,7 @@ spec:
                   contents:
                     items:
                       type: string
+                    minItems: 1
                     type: array
                   issuer:
                     type: string

diff --git a/api/v1beta1/openstackdataplanedeployment_types.go b/api/v1beta1/openstackdataplanedeployment_types.go
@@ -26,6 +26,7 @@ import (
 // OpenStackDataPlaneDeploymentSpec defines the desired state of OpenStackDataPlaneDeployment
 type OpenStackDataPlaneDeploymentSpec struct {
 	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinItems:=1
 	// NodeSets is the list of NodeSets deployed
 	NodeSets []string `json:"nodeSets"`
 

diff --git a/api/v1beta1/openstackdataplaneservice_types.go b/api/v1beta1/openstackdataplaneservice_types.go
@@ -30,6 +30,7 @@ type OpenstackDataPlaneServiceCert struct {
 	// Contents of the certificate
 	// This is a list of strings for properties that are needed in the cert
 	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinItems:=1
 	Contents []string `json:"contents"`
 
 	// Networks to include in SNI for the cert

diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml
@@ -59,6 +59,7 @@ spec:
               nodeSets:
                 items:
                   type: string
+                minItems: 1
                 type: array
               servicesOverride:
                 items:

diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml
@@ -65,6 +65,7 @@ spec:
                   contents:
                     items:
                       type: string
+                    minItems: 1
                     type: array
                   issuer:
                     type: string

diff --git a/config/manifests/bases/dataplane-operator.clusterserviceversion.yaml b/config/manifests/bases/dataplane-operator.clusterserviceversion.yaml
@@ -72,11 +72,6 @@ spec:
         path: conditions
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes.conditions
-      - description: Deployed
-        displayName: Deployed
-        path: deployed
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
       version: v1beta1
     - description: OpenStackDataPlaneService is the Schema for the openstackdataplaneservices
         API OpenStackDataPlaneService name must be a valid RFC1123 as it is used in