Merge pull request #133 from maykinmedia/feature/openzaak-1.5.0

🔖 Openzaak chart 1.5.0 - add celery beat
maykinmedia · Oct 18, 2024 · 7907cd7 · 7907cd7
2 parents e3eaac4 + 874e352
commit 7907cd7
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 11 deletions.
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.4.1
-appVersion: 1.14.0
+version: 1.5.0
+appVersion: 1.15.0
 
 dependencies:
   - name: redis

diff --git a/charts/openzaak/README.md b/charts/openzaak/README.md
@@ -1,14 +1,14 @@
 # openzaak
 
-![Version: 1.4.1](https://img.shields.io/badge/Version-1.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.14.0](https://img.shields.io/badge/AppVersion-1.14.0-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.0](https://img.shields.io/badge/AppVersion-1.15.0-informational?style=flat-square)
 
 Productiewaardige API's voor Zaakgericht Werken
 
 ## TL;DR
 
 ```console
 helm repo add my-repo https://maykinmedia.github.io/charts/
-helm install my-release my-repo/opennotificaties
+helm install my-release my-repo/openzaak
 ```
 
 ## Requirements
@@ -31,6 +31,19 @@ helm install my-release my-repo/opennotificaties
 | azureVaultSecret.objectName | string | `""` |  |
 | azureVaultSecret.secretName | string | `"{{ .Values.existingSecret }}"` |  |
 | azureVaultSecret.vaultName | string | `nil` |  |
+| beat.livenessProbe.failureThreshold | int | `6` |  |
+| beat.livenessProbe.initialDelaySeconds | int | `60` |  |
+| beat.livenessProbe.periodSeconds | int | `10` |  |
+| beat.livenessProbe.successThreshold | int | `1` |  |
+| beat.livenessProbe.timeoutSeconds | int | `5` |  |
+| beat.podLabels | object | `{}` |  |
+| beat.readinessProbe.failureThreshold | int | `6` |  |
+| beat.readinessProbe.initialDelaySeconds | int | `30` |  |
+| beat.readinessProbe.periodSeconds | int | `10` |  |
+| beat.readinessProbe.successThreshold | int | `1` |  |
+| beat.readinessProbe.timeoutSeconds | int | `5` |  |
+| beat.replicaCount | int | `1` |  |
+| beat.resources | object | `{}` |  |
 | configuration.enabled | bool | `false` |  |
 | configuration.initContainer.enabled | bool | `true` | Run the setup configuration command in a init container |
 | configuration.job.backoffLimit | int | `6` |  |
@@ -65,7 +78,7 @@ helm install my-release my-repo/opennotificaties
 | extraVerifyCerts | string | `""` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |
-| flower.enabled | bool | `true` |  |
+| flower.enabled | bool | `false` |  |
 | flower.livenessProbe.failureThreshold | int | `6` |  |
 | flower.livenessProbe.initialDelaySeconds | int | `60` |  |
 | flower.livenessProbe.periodSeconds | int | `10` |  |
@@ -172,7 +185,6 @@ helm install my-release my-repo/opennotificaties
 | settings.cache.default | string | `""` |  |
 | settings.cache.portalLocker | string | `""` |  |
 | settings.celery.brokerUrl | string | `""` |  |
-| settings.celery.enabled | bool | `true` | Deploy celery (worker), celery is required from openzaak version 1.8.0 |
 | settings.celery.logLevel | string | `"debug"` |  |
 | settings.celery.resultBackend | string | `""` |  |
 | settings.cmis.enabled | bool | `false` |  |

diff --git a/charts/openzaak/templates/deployment.yaml b/charts/openzaak/templates/deployment.yaml
@@ -222,7 +222,6 @@ spec:
       {{- end }}
 
 ---
-{{ if .Values.settings.celery.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -313,6 +312,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+
 ---
 {{ if .Values.flower.enabled -}}
 apiVersion: apps/v1
@@ -397,6 +397,90 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-  {{- end }}
 {{- end }}
+---
 
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "openzaak.beatFullname" . }}
+  labels:
+  {{- include "openzaak.beatLabels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.beat.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "openzaak.beatSelectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+    {{- include "openzaak.beatSelectorLabels" . | nindent 8 }}
+    {{- with .Values.beat.podLabels }}
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "openzaak.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ include "openzaak.beatFullname" . }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            {{- if .Values.extraEnvVars }}
+            {{- include "openzaak.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.existingSecret | default (include "openzaak.fullname" .) }}
+            - configMapRef:
+                name: {{ include "openzaak.fullname" . }}
+          resources:
+            {{- toYaml .Values.beat.resources | nindent 12 }}
+          command:
+            - /celery_beat.sh
+          volumeMounts:
+            - name: media
+              mountPath: /app/private-media
+              subPath: {{ .Values.persistence.privateMediaMountSubpath | default "openzaak/private_media" }}
+            - name: media
+              mountPath: /app/media
+              subPath: {{ .Values.persistence.mediaMountSubpath  | default "openzaak/media" }}
+            {{- if .Values.extraVolumeMounts }}
+            {{- include "openzaak.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 12 }}
+            {{- end }}
+      volumes:
+        - name: media
+          persistentVolumeClaim:
+          {{- if .Values.persistence.enabled }}
+            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ include "openzaak.fullname" . }}{{- end }}
+          {{- else }}
+          emptyDir: { }
+          {{- end }}
+        {{- if .Values.extraVolumes }}
+        {{- include "openzaak.tplvalues.render" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/openzaak/values.yaml b/charts/openzaak/values.yaml
@@ -282,8 +282,6 @@ settings:
     portalLocker: ""
 
   celery:
-    # -- Deploy celery (worker), celery is required from openzaak version 1.8.0
-    enabled: true
     # Celery cache settings, when the redis subchart is enabled these settings will be ignored and caching will default to the redis subchart services
     # e.g.:
     # brokerUrl: redis://openzaak-redis-master:6379/1
@@ -375,7 +373,7 @@ nginx:
   resources: {}
 
 flower:
-  enabled: true
+  enabled: false
   replicaCount: 1
   podLabels: {}
   livenessProbe:
@@ -392,6 +390,22 @@ flower:
     successThreshold: 1
   resources: {}
 
+beat:
+  replicaCount: 1
+  podLabels: {}
+  livenessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+  resources: {}
 
 ##################
 # Redis subchart #