-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Veronika Fisarova <[email protected]>
- Loading branch information
Showing
7 changed files
with
197 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| [1mdiff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [1mindex f460b11..a82074b 100644[m | ||
| [1m--- a/api/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [1m+++ b/api/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [36m@@ -103,6 +103,17 @@[m [mspec:[m | ||
| format: int32[m | ||
| minimum: 1[m | ||
| type: integer[m | ||
| [32m+[m[32m httpdCustomization:[m | ||
| [32m+[m[32m description: HttpdCustomization - customize the httpd service[m | ||
| [32m+[m[32m properties:[m | ||
| [32m+[m[32m processNumber:[m | ||
| [32m+[m[32m default: 3[m | ||
| [32m+[m[32m description: ProcessNumber - Number of processes running in keystone[m | ||
| [32m+[m[32m API[m | ||
| [32m+[m[32m format: int32[m | ||
| [32m+[m[32m minimum: 1[m | ||
| [32m+[m[32m type: integer[m | ||
| [32m+[m[32m type: object[m | ||
| memcachedInstance:[m | ||
| default: memcached[m | ||
| description: Memcached instance name.[m | ||
| [1mdiff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go[m | ||
| [1mindex a4c9b3c..29dd60d 100644[m | ||
| [1m--- a/api/v1beta1/keystoneapi_types.go[m | ||
| [1m+++ b/api/v1beta1/keystoneapi_types.go[m | ||
| [36m@@ -157,6 +157,10 @@[m [mtype KeystoneAPISpecCore struct {[m | ||
| // TODO: -> implement[m | ||
| DefaultConfigOverwrite map[string]string `json:"defaultConfigOverwrite,omitempty"`[m | ||
| [m | ||
| [32m+[m [32m// +kubebuilder:validation:Optional[m | ||
| [32m+[m [32m// HttpdCustomization - customize the httpd service[m | ||
| [32m+[m [32mHttpdCustomization HttpdCustomization `json:"httpdCustomization,omitempty"`[m | ||
| [32m+[m | ||
| // +kubebuilder:validation:Optional[m | ||
| // Resources - Compute Resources required by this service (Limits/Requests).[m | ||
| // https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/[m | ||
| [36m@@ -197,6 +201,15 @@[m [mtype PasswordSelector struct {[m | ||
| Admin string `json:"admin"`[m | ||
| }[m | ||
| [m | ||
| [32m+[m[32m// HttpdCustomization - customize the httpd service[m | ||
| [32m+[m[32mtype HttpdCustomization struct {[m | ||
| [32m+[m [32m// +kubebuilder:validation:Optional[m | ||
| [32m+[m [32m// +kubebuilder:default=3[m | ||
| [32m+[m [32m// +kubebuilder:validation:Minimum=1[m | ||
| [32m+[m [32m// ProcessNumber - Number of processes running in keystone API[m | ||
| [32m+[m [32mProcessNumber *int32 `json:"processNumber"`[m | ||
| [32m+[m[32m}[m | ||
| [32m+[m | ||
| // KeystoneAPIStatus defines the observed state of KeystoneAPI[m | ||
| type KeystoneAPIStatus struct {[m | ||
| // ReadyCount of keystone API instances[m | ||
| [1mdiff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go[m | ||
| [1mindex 7ee4749..da70b75 100644[m | ||
| [1m--- a/api/v1beta1/zz_generated.deepcopy.go[m | ||
| [1m+++ b/api/v1beta1/zz_generated.deepcopy.go[m | ||
| [36m@@ -49,6 +49,26 @@[m [mfunc (in *APIOverrideSpec) DeepCopy() *APIOverrideSpec {[m | ||
| return out[m | ||
| }[m | ||
| [m | ||
| [32m+[m[32m// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.[m | ||
| [32m+[m[32mfunc (in *HttpdCustomization) DeepCopyInto(out *HttpdCustomization) {[m | ||
| [32m+[m [32m*out = *in[m | ||
| [32m+[m [32mif in.ProcessNumber != nil {[m | ||
| [32m+[m [32min, out := &in.ProcessNumber, &out.ProcessNumber[m | ||
| [32m+[m [32m*out = new(int32)[m | ||
| [32m+[m [32m**out = **in[m | ||
| [32m+[m [32m}[m | ||
| [32m+[m[32m}[m | ||
| [32m+[m | ||
| [32m+[m[32m// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HttpdCustomization.[m | ||
| [32m+[m[32mfunc (in *HttpdCustomization) DeepCopy() *HttpdCustomization {[m | ||
| [32m+[m [32mif in == nil {[m | ||
| [32m+[m [32mreturn nil[m | ||
| [32m+[m [32m}[m | ||
| [32m+[m [32mout := new(HttpdCustomization)[m | ||
| [32m+[m [32min.DeepCopyInto(out)[m | ||
| [32m+[m [32mreturn out[m | ||
| [32m+[m[32m}[m | ||
| [32m+[m | ||
| // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.[m | ||
| func (in *KeystoneAPI) DeepCopyInto(out *KeystoneAPI) {[m | ||
| *out = *in[m | ||
| [36m@@ -172,6 +192,7 @@[m [mfunc (in *KeystoneAPISpecCore) DeepCopyInto(out *KeystoneAPISpecCore) {[m | ||
| (*out)[key] = val[m | ||
| }[m | ||
| }[m | ||
| [32m+[m [32min.HttpdCustomization.DeepCopyInto(&out.HttpdCustomization)[m | ||
| in.Resources.DeepCopyInto(&out.Resources)[m | ||
| if in.NetworkAttachments != nil {[m | ||
| in, out := &in.NetworkAttachments, &out.NetworkAttachments[m | ||
| [1mdiff --git a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [1mindex f460b11..a82074b 100644[m | ||
| [1m--- a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [1m+++ b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml[m | ||
| [36m@@ -103,6 +103,17 @@[m [mspec:[m | ||
| format: int32[m | ||
| minimum: 1[m | ||
| type: integer[m | ||
| [32m+[m[32m httpdCustomization:[m | ||
| [32m+[m[32m description: HttpdCustomization - customize the httpd service[m | ||
| [32m+[m[32m properties:[m | ||
| [32m+[m[32m processNumber:[m | ||
| [32m+[m[32m default: 3[m | ||
| [32m+[m[32m description: ProcessNumber - Number of processes running in keystone[m | ||
| [32m+[m[32m API[m | ||
| [32m+[m[32m format: int32[m | ||
| [32m+[m[32m minimum: 1[m | ||
| [32m+[m[32m type: integer[m | ||
| [32m+[m[32m type: object[m | ||
| memcachedInstance:[m | ||
| default: memcached[m | ||
| description: Memcached instance name.[m | ||
| [1mdiff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go[m | ||
| [1mindex 1ce2985..0df5e1a 100644[m | ||
| [1m--- a/controllers/keystoneapi_controller.go[m | ||
| [1m+++ b/controllers/keystoneapi_controller.go[m | ||
| [36m@@ -1190,6 +1190,7 @@[m [mfunc (r *KeystoneAPIReconciler) generateServiceConfigMaps([m | ||
| keystone.DatabaseName,[m | ||
| ),[m | ||
| "enableSecureRBAC": instance.Spec.EnableSecureRBAC,[m | ||
| [32m+[m [32m"ProcessNumber": instance.Spec.HttpdCustomization.ProcessNumber,[m | ||
| }[m | ||
| [m | ||
| // create httpd vhost template parameters[m | ||
| [1mdiff --git a/templates/keystoneapi/config/httpd.conf b/templates/keystoneapi/config/httpd.conf[m | ||
| [1mindex 2046181..641b6dd 100644[m | ||
| [1m--- a/templates/keystoneapi/config/httpd.conf[m | ||
| [1m+++ b/templates/keystoneapi/config/httpd.conf[m | ||
| [36m@@ -53,7 +53,7 @@[m [mCustomLog /dev/stdout proxy env=forwarded[m | ||
| [m | ||
| ## WSGI configuration[m | ||
| WSGIApplicationGroup %{GLOBAL}[m | ||
| [31m- WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=keystone processes=3 threads=1 user=keystone[m | ||
| [32m+[m[32m WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=keystone processes={{ $.ProcessNumber }} threads=1 user=keystone[m | ||
| WSGIProcessGroup {{ $endpt }}[m | ||
| WSGIScriptAlias / "/usr/bin/keystone-wsgi-public"[m | ||
| WSGIPassAuthorization On[m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters