Merge pull request #183 from Deydra71/add-kubebuilder-vladiations

Add missing kubebuilder validations
openstack-k8s-operators · Nov 12, 2024 · eebfdec · eebfdec
2 parents 336a127 + 996c1cc
commit eebfdec
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/api/bases/barbican.openstack.org_barbicans.yaml b/api/bases/barbican.openstack.org_barbicans.yaml
@@ -45,8 +45,8 @@ spec:
             description: BarbicanSpec defines the desired state of Barbican
             properties:
               barbicanAPI:
-                description: BarbicanAPITemplate defines the input parameters for
-                  the Barbican API service
+                description: BarbicanAPI - Spec definition for the  API services of
+                  this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will
@@ -367,8 +367,8 @@ spec:
                 - containerImage
                 type: object
               barbicanKeystoneListener:
-                description: BarbicanKeystoneListenerTemplate defines common Spec
-                  elements for the KeystoneListener process
+                description: BarbicanKeystoneListener - Spec definition for the KeystoneListener
+                  service of this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will
@@ -472,8 +472,8 @@ spec:
                 - containerImage
                 type: object
               barbicanWorker:
-                description: BarbicanWorkerTemplate defines common Spec elements for
-                  the Worker process
+                description: BarbicanWorker - Spec definition for the Worker service
+                  of this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will

diff --git a/api/v1beta1/barbican_types.go b/api/v1beta1/barbican_types.go
@@ -42,21 +42,33 @@ const (
 type BarbicanSpec struct {
 	BarbicanSpecBase `json:",inline"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanAPI - Spec definition for the  API services of this Barbican deployment
 	BarbicanAPI BarbicanAPITemplate `json:"barbicanAPI"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanWorker - Spec definition for the Worker service of this Barbican deployment
 	BarbicanWorker BarbicanWorkerTemplate `json:"barbicanWorker"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment
 	BarbicanKeystoneListener BarbicanKeystoneListenerTemplate `json:"barbicanKeystoneListener"`
 }
 
 // BarbicanSpecCore defines the desired state of Barbican, for use with the OpenStackControlplane CR (no containerImages)
 type BarbicanSpecCore struct {
 	BarbicanSpecBase `json:",inline"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanAPI - Spec definition for the  API services of this Barbican deployment
 	BarbicanAPI BarbicanAPITemplateCore `json:"barbicanAPI"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanWorker - Spec definition for the Worker service of this Barbican deployment
 	BarbicanWorker BarbicanWorkerTemplateCore `json:"barbicanWorker"`
 
+	// +kubebuilder:validation:Required
+	// BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment
 	BarbicanKeystoneListener BarbicanKeystoneListenerTemplateCore `json:"barbicanKeystoneListener"`
 }
 

diff --git a/config/crd/bases/barbican.openstack.org_barbicans.yaml b/config/crd/bases/barbican.openstack.org_barbicans.yaml
@@ -45,8 +45,8 @@ spec:
             description: BarbicanSpec defines the desired state of Barbican
             properties:
               barbicanAPI:
-                description: BarbicanAPITemplate defines the input parameters for
-                  the Barbican API service
+                description: BarbicanAPI - Spec definition for the  API services of
+                  this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will
@@ -367,8 +367,8 @@ spec:
                 - containerImage
                 type: object
               barbicanKeystoneListener:
-                description: BarbicanKeystoneListenerTemplate defines common Spec
-                  elements for the KeystoneListener process
+                description: BarbicanKeystoneListener - Spec definition for the KeystoneListener
+                  service of this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will
@@ -472,8 +472,8 @@ spec:
                 - containerImage
                 type: object
               barbicanWorker:
-                description: BarbicanWorkerTemplate defines common Spec elements for
-                  the Worker process
+                description: BarbicanWorker - Spec definition for the Worker service
+                  of this Barbican deployment
                 properties:
                   containerImage:
                     description: ContainerImage - Barbican Container Image URL (will