Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add configurable httpd timeout #403

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Add configurable httpd timeout #403

merged 2 commits into from
Nov 13, 2024
+67 −13

Conversation

fernandoroyosanchez
Copy link
Contributor

@fernandoroyosanchez fernandoroyosanchez commented Oct 23, 2024 •
edited
Loading

This patch adds an apiTimeout field to the OctaviaSpecCore to the already OctaviaSpec one to allow configure the timeouts for HAProxy and Apache.

Also fixing core API spec version of the new GetDefaultRouteAnnotations function.

Jira: https://issues.redhat.com/browse/OSPRH-6713

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 23, 2024

Hi @fernandoroyosanchez. Thanks for your PR.

I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gthiemonge gthiemonge self-assigned this Oct 24, 2024
@gthiemonge
Copy link
Contributor

/ok-to-test

@fernandoroyosanchez fernandoroyosanchez force-pushed the apitimeouthttpd branch 2 times, most recently from 738843e to 3753dc0 Compare October 24, 2024 12:12
@fernandoroyosanchez fernandoroyosanchez force-pushed the apitimeouthttpd branch 3 times, most recently from 08f3d3c to 586f791 Compare October 24, 2024 17:33
gthiemonge
gthiemonge requested changes Oct 25, 2024
View reviewed changes
api/v1beta1/octaviaapi_types.go
@@ -141,6 +141,10 @@ type OctaviaAPISpecCore struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec
// TLS - Parameters related to the TLS
TLS OctaviaApiTLS `json:"tls,omitempty"`

// +kubebuilder:validation:Optional
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. here it's defined as Optional

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for reopening this, but you left this Optional. Was that intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, to keep option to be passed by spec otherwise we trust on the octavia_api one and it will be passed by the controller

templates/octaviaapi/config/httpd.conf Show resolved Hide resolved
@fernandoroyosanchez fernandoroyosanchez force-pushed the apitimeouthttpd branch 4 times, most recently from 49e1839 to 8dd4a0a Compare October 25, 2024 13:40
@gthiemonge
Copy link
Contributor

/test octavia-operator-build-deploy-kuttl
registry quay.rdoproject.org: Get "https://quay.rdoproject.org/v2/": dial tcp 38.129.56.158:443: i/o timeout

@gthiemonge
Copy link
Contributor

/remove-approve

@openshift-ci openshift-ci bot removed the approved label Oct 28, 2024
@fernandoroyosanchez fernandoroyosanchez mentioned this pull request Oct 29, 2024
Closed
fernandoroyosanchez added a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Oct 29, 2024
@fernandoroyosanchez
Support Octavia setting route annotations
a5fd3f7 
This patch allows Octavia to set its route annotations.

Depends-On: openstack-k8s-operators/octavia-operator#403
@fernandoroyosanchez
Copy link
Contributor Author

/retest

@fernandoroyosanchez fernandoroyosanchez mentioned this pull request Nov 6, 2024
Merged
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
@openshift-merge-bot
This patch allows Octavia to set its route annotations.
c13dd7e 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
This patch allows Octavia to set its route annotations.
1a1947f 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
@fernandoroyosanchez fernandoroyosanchez mentioned this pull request Nov 7, 2024
Merged
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
This patch allows Octavia to set its route annotations.
90d1a65 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
This patch allows Octavia to set its route annotations.
339530c 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
This patch allows Octavia to set its route annotations.
14dd570 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 7, 2024
This patch allows Octavia to set its route annotations.
aa36658 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
18baea7 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
2f8caf2 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
41f8ae8 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
e5a366b 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
d81e5f4 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 11, 2024
This patch allows Octavia to set its route annotations.
3de27fc 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 12, 2024
This patch allows Octavia to set its route annotations.
0318c07 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
@weinimo
Copy link
Collaborator

weinimo commented Nov 12, 2024

lgtm apart from the question

@weinimo
Copy link
Collaborator

weinimo commented Nov 12, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 12, 2024
@gthiemonge
Copy link
Contributor

/approved

@gthiemonge
Copy link
Contributor

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fernandoroyosanchez, gthiemonge

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit e5285aa into openstack-k8s-operators:main Nov 13, 2024
5 checks passed
fernandoroyosanchez pushed a commit to fernandoroyosanchez/openstack-operator that referenced this pull request Nov 13, 2024
This patch allows Octavia to set its route annotations.
af4f24a 
Depends-On: openstack-k8s-operators/octavia-operator#403
Related-Issue: OSPRH-10959
@fernandoroyosanchez
Copy link
Contributor Author

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot
Copy link

@fernandoroyosanchez: new pull request created: #414

In response to this:

/cherry-pick 18.0-fr1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lewisdenny lewisdenny Awaiting requested review from lewisdenny

@weinimo weinimo Awaiting requested review from weinimo

@bshephar bshephar Awaiting requested review from bshephar

@gthiemonge gthiemonge Awaiting requested review from gthiemonge

Assignees

@weinimo weinimo

@gthiemonge gthiemonge

@bshephar bshephar

Labels
approved lgtm ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@fernandoroyosanchez @gthiemonge @weinimo @openshift-cherrypick-robot @bshephar