Skip to content

BZ 1368050: add ability to change connection limits for reencrypt and… #10513

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

Merged
merged 1 commit into from
Aug 19, 2016

Conversation

JacobTanenbaum
Copy link
Contributor

@JacobTanenbaum JacobTanenbaum commented Aug 18, 2016

… passthrough routes

Extend the DDoS protection annotations from PR9810 to extend to
reencrypt and passthrough routes

Bug 1368050

@JacobTanenbaum
Copy link
Contributor Author

@knobunc PTAL

@JacobTanenbaum
Copy link
Contributor Author

@ramr @rajatchopra PTAL

@rajatchopra
Copy link
Contributor

If one were to just put 'haproxy.router.openshift.io/rate-limit-connections' as TRUE, but not provide the actual limits, the stick table kind of just hangs busy with no real use. I am wondering how do we document this stuff.

Looks good otherwise.

We should work on a test for this stuff also.

@JacobTanenbaum
Copy link
Contributor Author

Added trello card for documentation and testing. I couldn't think of a better flow for the this code, because up to three different settings can use the table and an application may care about any combination of them.

@rajatchopra
Copy link
Contributor

@JacobTanenbaum I am fine with the current flow. We are good to go since we have the documentation TODO in the queue. Thanks.

@knobunc
Copy link
Contributor

knobunc commented Aug 18, 2016

LGTM [merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

#TCP connection rate not restricted
{{ end }}

{{ if (isInteger (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections.rate-http")) }}
Copy link
Contributor

@ramr ramr Aug 18, 2016

Choose a reason for hiding this comment

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

haproxy.router.openshift.io/rate-limit-connections.rate-http is not needed for pass through routes (since we don't parse/decipher the http request - http req rate will always be 0).

Edited this to haproxy.router.openshift.io/rate-limit-connections.rate-http for clarity.

Copy link
Contributor

Choose a reason for hiding this comment

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

this is the be_secure block, which is reencrypt. It looks like it's now not present in the passthrough section.

@eparis
Copy link
Member

eparis commented Aug 18, 2016

[test]

@openshift-bot
Copy link
Contributor

openshift-bot commented Aug 19, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8234/) (Image: devenv-rhel7_4882)

… passthrough routes

Extend the DDoS protection annotations from PR9810 to extend to
reencrypt and passthrough routes

https://bugzilla.redhat.com/show_bug.cgi?id=1368050
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 43c0285

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8234/)

@knobunc
Copy link
Contributor

knobunc commented Aug 19, 2016

LGTM

@eparis
Copy link
Member

eparis commented Aug 19, 2016

@ramr are you willing to tag for merge?

@@ -328,6 +328,23 @@ backend be_tcp_{{$cfgIdx}}
timeout tunnel {{$value}}
{{ end }}
{{ end }}

{{ if matchPattern "true|TRUE" (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections") }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit (should not block merge): indentation appears off here (should match the same level as immediately above)

@DirectXMan12
Copy link
Contributor

I think this LGTM as well 👍

@knobunc
Copy link
Contributor

knobunc commented Aug 19, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 43c0285

@openshift-bot openshift-bot merged commit 66667a3 into openshift:master Aug 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants