Add parameter to customize the number of manilaAPI processes

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Dec 5, 2024 · fa0b750 · fa0b750
1 parent 2a2058e
commit fa0b750
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 1 deletion.
diff --git a/api/bases/manila.openstack.org_manilaapis.yaml b/api/bases/manila.openstack.org_manilaapis.yaml
@@ -668,6 +668,11 @@ spec:
                 type: object
               transportURLSecret:
                 type: string
+              workers:
+                default: 3
+                format: int32
+                minimum: 1
+                type: integer
             required:
             - containerImage
             - serviceAccount

diff --git a/api/bases/manila.openstack.org_manilas.yaml b/api/bases/manila.openstack.org_manilas.yaml
@@ -672,6 +672,11 @@ spec:
                       caBundleSecretName:
                         type: string
                     type: object
+                  workers:
+                    default: 3
+                    format: int32
+                    minimum: 1
+                    type: integer
                 required:
                 - containerImage
                 type: object

diff --git a/api/v1beta1/manilaapi_types.go b/api/v1beta1/manilaapi_types.go
@@ -30,6 +30,12 @@ type ManilaAPITemplate struct {
 	// +kubebuilder:validation:Required
 	// ContainerImage - Manila API Container Image URL
 	ContainerImage string `json:"containerImage"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=3
+	// +kubebuilder:validation:Minimum=1
+	// Workers - Number of processes running ManilaAPI
+	Workers *int32 `json:"workers"`
 }
 
 // ManilaAPITemplateCore -

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/manila.openstack.org_manilaapis.yaml b/config/crd/bases/manila.openstack.org_manilaapis.yaml
@@ -668,6 +668,11 @@ spec:
                 type: object
               transportURLSecret:
                 type: string
+              workers:
+                default: 3
+                format: int32
+                minimum: 1
+                type: integer
             required:
             - containerImage
             - serviceAccount

diff --git a/config/crd/bases/manila.openstack.org_manilas.yaml b/config/crd/bases/manila.openstack.org_manilas.yaml
@@ -672,6 +672,11 @@ spec:
                       caBundleSecretName:
                         type: string
                     type: object
+                  workers:
+                    default: 3
+                    format: int32
+                    minimum: 1
+                    type: integer
                 required:
                 - containerImage
                 type: object

diff --git a/controllers/manila_controller.go b/controllers/manila_controller.go
@@ -897,6 +897,7 @@ func (r *ManilaReconciler) generateServiceConfig(
 			manila.DatabaseCRName),
 		"MemcachedServersWithInet": memcached.GetMemcachedServerListWithInetString(),
 		"TimeOut":                  instance.Spec.APITimeout,
+		"Workers":                  instance.Spec.ManilaAPI.Workers,
 	}
 
 	// create httpd  vhost template parameters

diff --git a/templates/manila/config/10-manila_wsgi.conf b/templates/manila/config/10-manila_wsgi.conf
@@ -32,7 +32,7 @@
 
   ## WSGI configuration
   WSGIApplicationGroup %{GLOBAL}
-  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=manila processes=4 threads=1 user=manila
+  WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=manila processes={{ $.Workers }} threads=1 user=manila
   WSGIProcessGroup {{ $endpt }}
   WSGIScriptAlias / "/var/www/cgi-bin/manila/manila-wsgi"
   WSGIPassAuthorization On