Merge pull request #179 from maykinmedia/sync-oip-1.27

Bring OIP uWSGI settings in sync with v1.27.0
maykinmedia · Feb 11, 2025 · f65fd65 · f65fd65
2 parents 811a58c + 5380b23
commit f65fd65
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/charts/openinwoner/CHANGELOG.md b/charts/openinwoner/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.7.0-beta.1 (2025-05-02)
+
+- Bring uWSGI settings into sync with available options for the upcoming `v1.27` release
+  of OIP.
+
 ## 1.7.0-beta.0 (2025-10-01)
 
 - [#148] Replace the worker liveness probe with the `celery inspect active` command. This should detect when a worker is down and should not interrupt long running tasks.

diff --git a/charts/openinwoner/Chart.yaml b/charts/openinwoner/Chart.yaml
@@ -3,8 +3,8 @@ name: openinwoner
 description: Platform voor gemeenten en overheden om producten inzichtelijker en toegankelijker te maken voor inwoners.
 
 type: application
-version: 1.7.0-beta.0
-appVersion: latest
+version: 1.7.0-beta.1
+appVersion: 1.27.0
 icon: https://docs.openinwoner.nl/en/latest/_static/logo.png
 
 dependencies:

diff --git a/charts/openinwoner/templates/configmap.yaml b/charts/openinwoner/templates/configmap.yaml
@@ -56,9 +56,6 @@ data:
   {{- if .Values.settings.elasticapm.url }}
   ELASTIC_APM_SERVICE_NAME: {{ .Values.settings.elasticapm.serviceName | toString |  quote }}
   {{- end }}
-  {{- if .Values.settings.uwsgi.master }}
-  UWSGI_MASTER:  {{ if .Values.settings.uwsgi.master }}"1"{{ else }}"0"{{ end }}
-  {{- end }}
   {{- if .Values.settings.uwsgi.threads }}
   UWSGI_THREADS: {{ .Values.settings.uwsgi.threads  | toString | quote }}
   {{- end }}
@@ -72,9 +69,17 @@ data:
   UWSGI_HARAKIRI: {{ .Values.settings.uwsgi.harakiri | toString | quote }}
   {{- end }}
   {{- if .Values.settings.uwsgi.port }}
-  UWSGI_PORT: {{ .Values.settings.uwsgi.port | toString | quote }}
+  PORT: {{ .Values.settings.uwsgi.port | toString | quote }}
   {{- end }}
   {{- if .Values.settings.uwsgi.httpTimeout }}
   UWSGI_HTTP_TIMEOUT: {{ .Values.settings.uwsgi.httpTimeout | toString | quote }}
   {{- end }}
-
+  {{- if .Values.settings.uwsgi.postBuffering }}
+  UWSGI_POST_BUFFERING: {{ .Values.settings.uwsgi.postBuffering | toString | quote }}
+  {{- end }}
+  {{- if .Values.settings.uwsgi.bufferSize }}
+  UWSGI_BUFFER_SIZE: {{ .Values.settings.uwsgi.bufferSize | toString | quote }}
+  {{- end }}
+  {{- if .Values.settings.uwsgi.httpKeepalive }}
+  UWSGI_HTTP_KEEPALIVE: {{ if .Values.settings.uwsgi.httpKeepalive }}"1"{{ else }}"0"{{ end }}
+  {{- end }}
diff --git a/charts/openinwoner/values.yaml b/charts/openinwoner/values.yaml
@@ -270,13 +270,16 @@ settings:
   debug: false
 
   uwsgi:
-    master: false
     threads: ""
     processes: ""
     maxRequests: ""
     harakiri: ""
     port: ""
     httpTimeout: ""
+    httpKeepalive: ""
+    # In bytes:
+    postBuffering: ""
+    bufferSize: ""
 
   # -- Runs a init container that will run /app/src/manage.py search_index --rebuild -f. You might want to enable this one time for new deployments if you want to prevent 500 errors when using the search function
   searchInexInitContainer: false