Merge pull request #141 from rabi/markers

Fix kubebuilder markers

Author: openshift-merge-robot

api/bases/mariadb.openstack.org_mariadbs.yaml

@@ -45,8 +45,7 @@ spec:
             description: MariaDBSpec defines the desired state of MariaDB
             properties:
               adoptionRedirect:
-                description: AdoptionRedirectSpec defines redirection to a different
-                  DB instance during Adoption
+                description: Adoption configuration
                 properties:
                   host:
                     description: MariaDB host to redirect to (IP or name)
@@ -60,11 +59,16 @@ spec:
                 description: Secret containing a RootPassword
                 type: string
               storageClass:
+                description: Storage class to host the mariadb databases
                 type: string
               storageRequest:
+                description: Storage size allocated for the mariadb databases
                 type: string
             required:
             - containerImage
+            - secret
+            - storageClass
+            - storageRequest
             type: object
           status:
             description: MariaDBStatus defines the observed state of MariaDB

api/v1beta1/galera_types.go

@@ -38,6 +38,7 @@ type GaleraSpec struct {
 	// +kubebuilder:validation:Required
 	StorageRequest string `json:"storageRequest"`
 	// Name of the galera container image to run (will be set to environmental default if empty)
+	// +kubebuilder:validation:Required
 	ContainerImage string `json:"containerImage"`
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:default=1

api/v1beta1/mariadb_types.go

@@ -32,15 +32,19 @@ const (
 // MariaDBSpec defines the desired state of MariaDB
 type MariaDBSpec struct {
 	// Secret containing a RootPassword
-	Secret string `json:"secret,omitempty"`
-
-	StorageClass string `json:"storageClass,omitempty"`
-
-	StorageRequest string `json:"storageRequest,omitempty"`
-
+	// +kubebuilder:validation:Required
+	Secret string `json:"secret"`
+	// Storage class to host the mariadb databases
+	// +kubebuilder:validation:Required
+	StorageClass string `json:"storageClass"`
+	// Storage size allocated for the mariadb databases
+	// +kubebuilder:validation:Required
+	StorageRequest string `json:"storageRequest"`
 	// ContainerImage - Container Image URL (will be set to environmental default if empty)
+	// +kubebuilder:validation:Required
 	ContainerImage string `json:"containerImage"`
-
+	// Adoption configuration
+	// +kubebuilder:validation:Optional
 	AdoptionRedirect AdoptionRedirectSpec `json:"adoptionRedirect,omitempty"`
 }
 

config/crd/bases/mariadb.openstack.org_mariadbs.yaml

@@ -45,8 +45,7 @@ spec:
             description: MariaDBSpec defines the desired state of MariaDB
             properties:
               adoptionRedirect:
-                description: AdoptionRedirectSpec defines redirection to a different
-                  DB instance during Adoption
+                description: Adoption configuration
                 properties:
                   host:
                     description: MariaDB host to redirect to (IP or name)
@@ -60,11 +59,16 @@ spec:
                 description: Secret containing a RootPassword
                 type: string
               storageClass:
+                description: Storage class to host the mariadb databases
                 type: string
               storageRequest:
+                description: Storage size allocated for the mariadb databases
                 type: string
             required:
             - containerImage
+            - secret
+            - storageClass
+            - storageRequest
             type: object
           status:
             description: MariaDBStatus defines the observed state of MariaDB