Merge pull request #128 from maykinmedia/feature/openzaak-and-opennot…

…ificaties-release 🔖 1.4.0 openzaak and opennotificaties
maykinmedia · Sep 3, 2024 · ef93159 · ef93159
2 parents 52a9c3d + ab23ebe
commit ef93159
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 22 deletions.
diff --git a/charts/opennotificaties/Chart.yaml b/charts/opennotificaties/Chart.yaml
@@ -3,8 +3,8 @@ name: opennotificaties
 description: API voor het routeren van notificaties
 
 type: application
-version: 1.3.6
-appVersion: 1.6.0
+version: 1.4.0
+appVersion: 1.7.0
 
 dependencies:
   - name: redis

diff --git a/charts/opennotificaties/templates/configmap.yaml b/charts/opennotificaties/templates/configmap.yaml
@@ -20,6 +20,9 @@ data:
   {{- end }}
   CELERY_LOGLEVEL:  {{ .Values.settings.celery.logLevel | upper | toString | quote }}
   CELERY_WORKER_CONCURRENCY: {{ .Values.worker.concurrency | toString | quote }}
+  {{ if .Values.worker.maxWorkerLivenessDelta }}
+  MAX_WORKER_LIVENESS_DELTA: {{ .Values.worker.maxWorkerLivenessDelta | toString | quote }}
+  {{- end }}    
   {{- if .Values.tags.rabbitmq }}
   RABBITMQ_HOST: {{ include "common.names.fullname" .Subcharts.rabbitmq | toString | quote }}
   {{- else }}

diff --git a/charts/opennotificaties/templates/deployment.yaml b/charts/opennotificaties/templates/deployment.yaml
@@ -176,6 +176,10 @@ spec:
             {{- if .Values.extraEnvVars }}
             {{- include "opennotificaties.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
+            {{- if .Values.worker.livenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.worker.livenessProbe | nindent 12 }}
+            {{- end }}
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
           command:

diff --git a/charts/opennotificaties/values.yaml b/charts/opennotificaties/values.yaml
@@ -329,17 +329,17 @@ worker:
   concurrency: 4
   podLabels: {}
   resources: {}
+  maxWorkerLivenessDelta: ""
   livenessProbe:
+    exec:
+      command:
+        - python
+        - /app/bin/check_celery_worker_liveness.py
     initialDelaySeconds: 60
-    periodSeconds: 10
-    timeoutSeconds: 5
-    failureThreshold: 3
-    successThreshold: 1
-  readinessProbe:
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    timeoutSeconds: 5
-    failureThreshold: 3
+    # Periodeseconds should not exceed maxWorkerLivenessDelta
+    periodSeconds: 50
+    timeoutSeconds: 15
+    failureThreshold: 10
     successThreshold: 1
   autoscaling:
     enabled: false

diff --git a/charts/openzaak/Chart.yaml b/charts/openzaak/Chart.yaml
@@ -3,8 +3,8 @@ name: openzaak
 description: Productiewaardige API's voor Zaakgericht Werken
 
 type: application
-version: 1.3.6
-appVersion: 1.13.0
+version: 1.4.0
+appVersion: 1.14.0
 
 dependencies:
   - name: redis

diff --git a/charts/openzaak/templates/configmap.yaml b/charts/openzaak/templates/configmap.yaml
@@ -39,6 +39,9 @@ data:
   {{- if .Values.settings.cmis.mapperFile }}
   CMIS_MAPPER_FILE: {{ .Values.settings.cmis.mapperFile | toString | quote }}
   {{- end }}
+  {{ if .Values.worker.maxWorkerLivenessDelta }}
+  MAX_WORKER_LIVENESS_DELTA: {{ .Values.worker.maxWorkerLivenessDelta | toString | quote }}
+  {{- end }}  
   DB_NAME: {{ .Values.settings.database.name | toString | quote }}
   DB_HOST: {{ .Values.global.settings.databaseHost | default .Values.settings.database.host | toString | quote }}
   DB_USER: {{ .Values.settings.database.username | toString | quote }}

diff --git a/charts/openzaak/templates/deployment.yaml b/charts/openzaak/templates/deployment.yaml
@@ -272,6 +272,10 @@ spec:
             {{- if .Values.extraEnvVars }}
             {{- include "openzaak.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
+            {{- if .Values.worker.livenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.worker.livenessProbe | nindent 12 }}
+            {{- end }}            
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
           command:

diff --git a/charts/openzaak/values.yaml b/charts/openzaak/values.yaml
@@ -319,17 +319,17 @@ worker:
   concurrency: 4
   podLabels: {}
   resources: {}
+  maxWorkerLivenessDelta: ""
   livenessProbe:
+    exec:
+      command:
+        - python
+        - /app/bin/check_celery_worker_liveness.py
     initialDelaySeconds: 60
-    periodSeconds: 10
-    timeoutSeconds: 5
-    failureThreshold: 3
-    successThreshold: 1
-  readinessProbe:
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    timeoutSeconds: 5
-    failureThreshold: 3
+    # Periodeseconds should not exceed maxWorkerLivenessDelta
+    periodSeconds: 50
+    timeoutSeconds: 15
+    failureThreshold: 10
     successThreshold: 1
   autoscaling:
     enabled: false