Merge pull request #7953 from yuvipanda/nginx

Add missing nginx.org annotations

Author: yuvipanda

helm-charts/basehub/values.yaml

@@ -12,6 +12,7 @@ binderhub-service:
     ingressClassName: nginx
     annotations:
       nginx.ingress.kubernetes.io/proxy-body-size: 256m
+      nginx.org/client-max-body-size: 256m
       cert-manager.io/cluster-issuer: letsencrypt-prod
   nodeSelector:
     hub.jupyter.org/node-purpose: core

helm-charts/support/values.yaml

@@ -186,6 +186,7 @@ prometheus:
         # prometheus, the central grafana used does go through nginx. So we
         # increase the timeout here as well.
         nginx.ingress.kubernetes.io/proxy-read-timeout: "120"
+        nginx.org/proxy-read-timeout: "120s"
     strategy:
       # type is set to Recreate as we have a persistent disk attached. The
       # default of RollingUpdate would fail by getting stuck waiting for a new
@@ -317,12 +318,14 @@ grafana:
       # request (via jupyterhub/grafana-dashboard's deploy script, from a github
       # workflow) to update dashboards with json files representing them.
       nginx.ingress.kubernetes.io/proxy-body-size: 64m
+      nginx.org/client-max-body-size: 64m
       # Increase timeout for each query made by the grafana frontend to the
       # grafana backend to 2min, which is the default timeout for prometheus
       # queries. This also matches the timeout for the dataproxy in grafana,
       # set under `grafana.ini` below. These two timeouts are set together
       # to allow prometheus the best chance of executing queries we care about.
       nginx.ingress.kubernetes.io/proxy-read-timeout: "120"
+      nginx.org/proxy-read-timeout: 120s
       cert-manager.io/cluster-issuer: letsencrypt-prod
 
   # grafana is partially configured for GitHub authentication here, but the