-
Notifications
You must be signed in to change notification settings - Fork 48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added a parameter 'apiTimeout' to allow customization #891
Added a parameter 'apiTimeout' to allow customization #891
Conversation
im kind of -1 on this. we expclitly said we should not be adding tunabel like this for each config option to the CRDs i wonder is the there a way we can use DefaultConfigOverwrite or similar to allow a similar config override mechanism for apache does it support dropin files? if not we may need to do this but to me the is a code smell in the CRD. |
@@ -57,6 +57,11 @@ spec: | |||
description: APIDatabaseHostname - hostname to use when accessing | |||
the API DB | |||
type: string | |||
apiTimeout: | |||
default: 600 | |||
description: APITimeout for Route and Apache |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldnt the route timeout be condired by the existing service override?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that is likely another timeout, or how would that help to have it shown up in templates/novametadata/config/httpd.conf ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
however, we need to document that timouts set for APIs and haproxy configs in routes/ingress must match
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I go with same timeout like it was done in cinder, glance etc openstack-k8s-operators/openstack-operator#830 also after this pr I will also creat openstak-operator pr for nova and placement
2fb078a
to
2337a4c
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fe7dbf316c584e8ead6cd928abb16d63 ❌ openstack-meta-content-provider FAILURE in 12m 07s |
2337a4c
to
d66296c
Compare
Depends-On: openstack-k8s-operators/placement-operator#270 Depends-On: openstack-k8s-operators/nova-operator#891 ref OSPRH-10962 ref OSPRH-10955
d66296c
to
92ad78b
Compare
Added a parameter 'apiTimeout' to allow customization to the Apache timeout. The default is set to 60s which we do set for HAProxy timeouts currently. To be able to change the HAProxy value based on the apiTimeout with any update (and not just the first time) the code adds a custom annotation "api.nova.openstack.org/timeout" with the value that was initially set, this way flags it as being set by the nova-operator. Timeout is global for both api and metadata and they are set from nova lvl There will be follow up patch in openstack-operator to utilize the method 'SetDefaultRouteAnnotations' to set these default route annotations in openstack-operator
92ad78b
to
d6343b1
Compare
Depends-On: openstack-k8s-operators/placement-operator#270 Depends-On: openstack-k8s-operators/nova-operator#891 ref OSPRH-10962 ref OSPRH-10955
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
The logic keeps the httpd timeout in sync with the haproxy timeout in the route if no override is specified by the deployer on the route.
It is couple of lines of CRD size increase, no nested structs are introduced. It is following an existing pattern. The not choose alternative would be to make the httpd conf overridable via a customeServiceOverride type of field. However we don't have such example in other operators today.
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: gibizer, mrkisaolamb The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@dprince I approved this API change but I wanted to also notify you that it is coming. |
d7e33fc
into
openstack-k8s-operators:main
Depends-On: openstack-k8s-operators/placement-operator#270 Depends-On: openstack-k8s-operators/nova-operator#891 ref OSPRH-10962 ref OSPRH-10955
Added a parameter 'apiTimeout' to allow customization to the Apache timeout.
The default is set to 120s which we do set for
HAProxy timeouts currently.
To be able to change the HAProxy value based on the apiTimeout with any update (and not just the first time) the code adds a custom annotation "api.neutron.openstack.org/timeout" with the value that was initially set, this way flags it as being set by the nova-operator.
Timeout is global for both api and metadata and they are set from nova lvl
There will be follow up patch in openstack-operator to utilize the method 'SetDefaultRouteAnnotations' to set these default route annotations in openstack-operator
Resolve: https://issues.redhat.com/browse/OSPRH-10955