Merge remote-tracking branch 'origin/maven/fixes/8.0' into maven/rele…

…ase/8.0
edu-sharing · Oct 27, 2023 · b0dc500 · b0dc500
2 parents 9dba5c5 + 8f3f7d6
commit b0dc500
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/deploy/docker/helm/src/main/chart/templates/ingress.yml b/deploy/docker/helm/src/main/chart/templates/ingress.yml
@@ -5,6 +5,10 @@ metadata:
   name: edu-sharing-connector-ingress
   annotations:
     cert-manager.io/cluster-issuer: {{ .Values.clusterIssuer }}
+    nginx.ingress.kubernetes.io/proxy-body-size: "5g"
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "60"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "180"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "180"
 spec:
   tls:
   - hosts:

diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml
@@ -49,7 +49,7 @@ spec:
         - name: POST_MAX_SIZE
           value: {{ .Values.postMaxSize | default "513M" }}
         - name: MEMORY_LIMIT
-          value: {{ .Values.memoryLimit | "1024M" }}
+          value: {{ .Values.memoryLimit | default "1024M" }}
         livenessProbe:
           httpGet:
             path: /metadata