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

Fix duplicate timeout directive #17030

Merged
merged 2 commits into from
Oct 31, 2017
Merged

Fix duplicate timeout directive #17030

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
724f0a7
Fix duplicate timeout directive
imcsk8 Oct 24, 2017
285296f
Fix incorrect comment in template
imcsk8 Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions images/router/haproxy/conf/haproxy-config.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,6 @@ backend be_secure:{{$cfgIdx}}
timeout server {{$value}}
{{- end }} {{/* end balance algorithm setting. */}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the comment {{/* end balance algorithm setting. */}} actually correct?

I think I'd just lose it.


{{- with $value := firstMatch $timeSpecPattern (index $cfg.Annotations "haproxy.router.openshift.io/timeout") }}
timeout server {{$value}}
{{- end }}

{{- if isTrue (index $cfg.Annotations "haproxy.router.openshift.io/rate-limit-connections") }}
stick-table type ip size 100k expire 30s store conn_cur,conn_rate(3s),http_req_rate(10s)
tcp-request content track-sc2 src
Expand Down