Merge pull request #17030 from imcsk8/duplicate-timeout

Automatic merge from submit-queue. Fix duplicate timeout directive When haproxy.router.openshift.io/timeout is set the template is setting the timeout directive twice. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503637
openshift · Oct 31, 2017 · 1f2c61a · 1f2c61a
2 parents 6b1a836 + 285296f
commit 1f2c61a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/images/router/haproxy/conf/haproxy-config.template b/images/router/haproxy/conf/haproxy-config.template
@@ -343,10 +343,6 @@ backend be_secure:{{$cfgIdx}}
   tcp-request content reject if !whitelist
     {{- end }}
     {{- with $value := firstMatch $timeSpecPattern (index $cfg.Annotations "haproxy.router.openshift.io/timeout")}}
-  timeout server  {{$value}}
-    {{- end }} {{/* end balance algorithm setting. */}}
-
-    {{- with $value := firstMatch $timeSpecPattern (index $cfg.Annotations "haproxy.router.openshift.io/timeout") }}
   timeout server  {{$value}}
     {{- end }}