Skip to content

Commit 2007ee3

Browse files
Swapped nginx default annotations for their OpenShift HAProxy equivalents (#859)
Doc update ### Checklist - [ ] Follow the [manual testing process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md) - [ ] Update [changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md) - [ ] Update [Kubernetes update doc](https://docs.sourcegraph.com/admin/updates/kubernetes) ### Test plan <!-- As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests are REQUIRED to provide a "test plan". A test plan is a loose explanation of what you have done or implemented to test this, as outlined in our Testing principles and guidelines: https://docs.sourcegraph.com/dev/background-information/testing_principles Write your test plan here after the "Test plan" header. -->
1 parent b7549ff commit 2007ee3

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

charts/sourcegraph/examples/openshift/override.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,16 @@ frontend:
257257

258258
ingress:
259259
annotations:
260-
# If using HAProxy router, add the timeout to prevent SSE / streaming timeouts
260+
# Null out nginx defaults from values.yaml — not applicable
261+
kubernetes.io/ingress.class: null
262+
nginx.ingress.kubernetes.io/proxy-body-size: null
263+
# HAProxy router: prevent SSE / streaming timeouts
261264
haproxy.router.openshift.io/timeout: 5m
262-
kubernetes.io/ingress.class: openshift-default-example
263-
nginx.ingress.kubernetes.io/proxy-body-size: 150m
264-
# If terminating TLS on the router
265+
# HAProxy router: equivalent of nginx proxy-body-size, for large Git pushes / file uploads
266+
haproxy.router.openshift.io/request-body-size: 150m
267+
# TLS termination at the router
265268
route.openshift.io/termination: edge
269+
ingressClassName: openshift-default-example
266270
host: sourcegraph.example.com
267271

268272
################################################################################

0 commit comments

Comments
 (0)