Skip to content

Commit 71380ef

Browse files
TheRealJonopenshift-cherrypick-robot
authored andcommitted
CONSOLE-3624: Add haproxy timeout annotation to console routes
Add 5 minute haproxy timeout annotation to console route to match most browsers' maximum timeout.
1 parent 653ebbc commit 71380ef

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

bindata/routes/console-custom-route.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# This route 'console-custom' manifest is used in case a custom console route is set
22
# either on the ingress config or console-operator config.
3-
# The 'console-custom' route will be pointing to the 'console' service.
3+
# The 'console-custom' route will be pointing to the 'console' service.
44
# Only a single custom console route is supported.
55
kind: Route
66
apiVersion: route.openshift.io/v1
77
metadata:
88
name: console-custom
99
namespace: openshift-console
10+
annotations:
11+
haproxy.router.openshift.io/timeout: 5m
1012
labels:
1113
app: console
1214
spec:

bindata/routes/console-route.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Default 'console' route manifest.
2-
# The 'console' route will be pointing to the 'console' service.
2+
# The 'console' route will be pointing to the 'console' service.
33
kind: Route
44
apiVersion: route.openshift.io/v1
55
metadata:
66
name: console
77
namespace: openshift-console
8+
annotations:
9+
haproxy.router.openshift.io/timeout: 5m
810
labels:
911
app: console
1012
spec:

pkg/console/assets/bindata.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)