Add configurable API Timeout #515
Conversation
Depends-On: openstack-k8s-operators/keystone-operator#515 Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
Depends-On: openstack-k8s-operators/keystone-operator#515 Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
| @@ -167,3 +167,25 @@ func (r *KeystoneAPI) ValidateDelete() (admission.Warnings, error) { | |||
| // TODO(user): fill in your validation logic upon object deletion. | |||
| return nil, nil | |||
| } | |||
|
|
|||
| // SetDefaultRouteAnnotations sets HAProxy timeout values of the route | |||
| func (spec *KeystoneAPISpecCore) SetDefaultRouteAnnotations(annotations map[string]string) { | |||
There was a problem hiding this comment.
What calls this function? I don't see it being called explicitly.
There was a problem hiding this comment.
It's being called from the openstack-operator - https://github.com/openstack-k8s-operators/openstack-operator/pull/1223/files#diff-fcb2ae5fc2510a906947042c693c1d054971fa6a901ef6013b4d4c91138a9839R775
api/v1beta1/keystoneapi_webhook.go
Outdated
| const haProxyAnno = "haproxy.router.openshift.io/timeout" | ||
| // Use a custom annotation to flag when the operator has set the default HAProxy timeout | ||
| // With the annotation func determines when to overwrite existing HAProxy timeout with the APITimeout | ||
| const keystoneAnno = "api.Keystone.openstack.org/timeout" |
| @@ -167,3 +167,25 @@ func (r *KeystoneAPI) ValidateDelete() (admission.Warnings, error) { | |||
| // TODO(user): fill in your validation logic upon object deletion. | |||
| return nil, nil | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
also need to handle 0 ApiTimeout in webhook https://github.com/search?q=org%3Aopenstack-k8s-operators%20%22spec.APITimeout%20%3D%3D%200%22&type=code
...to allow configure the timeouts for HAProxy and Apache. Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
2b5f7ea to
22d9c40
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Deydra71, stuggi, xek 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 |
ece4d21
into
openstack-k8s-operators:main
Depends-On: openstack-k8s-operators/keystone-operator#515 Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
Depends-On: openstack-k8s-operators/keystone-operator#515 Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
...to allow configure timeouts for HAProxy and Apache.
Jira: OSPRH-10960