Ability to customize nginx client_max_body_size (#997)

At the moment, this value is hard coded to 300M. If selenium driver try to upload a file bigger than this limit it will fail.
zalando · Jul 19, 2019 · 49063e6 · 49063e6
1 parent 03559f5
commit 49063e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/charts/zalenium/templates/_pod-template.yaml b/charts/zalenium/templates/_pod-template.yaml
@@ -117,6 +117,10 @@ spec:
         - name: CONTEXT_PATH
           value: {{ .Values.ingress.path | quote }}
         {{- end }}
+        {{- if .Values.ingress.maxBodySize }}
+        - name: NGINX_MAX_BODY_SIZE
+          value: {{ .Values.ingress.maxBodySize | quote }}
+        {{- end }}
         {{- if .Values.hub.sauceLabsEnabled }}
         - name: SAUCE_LABS_ENABLED
           value: {{ .Values.hub.sauceLabsEnabled | quote }}

diff --git a/charts/zalenium/values.yaml b/charts/zalenium/values.yaml
@@ -168,9 +168,10 @@ ingress:
   # If your ingress host name is only for Zalenium,
   # no need to set path
   # path: /
+  # maxBodySize: 300M
   annotations:
-    # kubernetes.io/ingress.class: "nginx"
-    # kubernetes.io/tls-acme: "true"
+  # kubernetes.io/ingress.class: "nginx"
+  # kubernetes.io/tls-acme: "true"
   ## For RBAC support:
 
 rbac:

diff --git a/docker/nginx.conf b/docker/nginx.conf
@@ -4,7 +4,7 @@ events {
     worker_connections 1024;
 }
 http {
-    client_max_body_size        300M;
+    client_max_body_size        {{nginxMaxBodySize}};
     proxy_connect_timeout       900s;
     proxy_send_timeout          900s;
     proxy_read_timeout          900s;

diff --git a/docs/_posts/2000-01-05-docker.md b/docs/_posts/2000-01-05-docker.md
@@ -745,6 +745,13 @@ Any of these environment variables can be passed to Zalenium like this:
         Time in seconds for <code>browserTmeout</code>, maps to the same parameter in default Selenium Grid.
       </td>
     </tr>
+    <tr>
+      <td><code>NGINX_MAX_BODY_SIZE</code></td>
+      <td>300M</td>
+      <td>
+        Max body size accepted by nginx. Can be usefull if selenium test try to upload file bigger than 300M.
+      </td>
+    </tr>
   </tbody>
 </table>
 

diff --git a/scripts/zalenium.sh b/scripts/zalenium.sh
@@ -54,6 +54,7 @@ CONTEXT_PATH=${CONTEXT_PATH:-/}
 if [ -z "${CONTEXT_PATH}" ] || [ "${CONTEXT_PATH}" = "/" ]; then
     CONTEXT_PATH=""
 fi
+NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE:-300M}
 
 PID_PATH_SELENIUM=/tmp/selenium-pid
 PID_PATH_SAUCE_LABS_NODE=/tmp/sauce-labs-node-pid
@@ -487,6 +488,7 @@ StartUp()
 
     # In nginx.conf, Replace {{contextPath}} with value of APPEND_CONTEXT_PATH
     sed -i.bak "s~{{contextPath}}~${CONTEXT_PATH}~" /home/seluser/nginx.conf
+    sed -i.bak "s~{{nginxMaxBodySize}}~${NGINX_MAX_BODY_SIZE}~" /home/seluser/nginx.conf
 
     echo "Starting Nginx reverse proxy..."
     nginx -c /home/seluser/nginx.conf