Merge pull request #472 from stuggi/database_instance

openshift-merge-bot[bot] · web-flow · commit 99877452c35b · 2025-09-19T14:49:54.000Z
Align and remove omitempty from databaseInstance
diff --git a/api/bases/manila.openstack.org_manilas.yaml b/api/bases/manila.openstack.org_manilas.yaml
@@ -1780,6 +1780,7 @@ spec:
                     type: string
                 type: object
             required:
+            - databaseInstance
             - manilaAPI
             - manilaScheduler
             - memcachedInstance
diff --git a/api/v1beta1/manila_types.go b/api/v1beta1/manila_types.go
@@ -74,7 +74,7 @@ type ManilaSpecBase struct {
 	// MariaDB instance name
 	// Right now required by the maridb-operator to get the credentials from the instance to create the DB
 	// Might not be required in future
-	DatabaseInstance string `json:"databaseInstance,omitempty"`
+	DatabaseInstance string `json:"databaseInstance"`
 
 	// +kubebuilder:validation:Required
 	// +kubebuilder:default=rabbitmq
diff --git a/config/crd/bases/manila.openstack.org_manilas.yaml b/config/crd/bases/manila.openstack.org_manilas.yaml
@@ -1780,6 +1780,7 @@ spec:
                     type: string
                 type: object
             required:
+            - databaseInstance
             - manilaAPI
             - manilaScheduler
             - memcachedInstance
