Merge pull request #134 from maykinmedia/feature/opennotificaties-1.5.0

🔖 opennotificaties 1.5.0 - add beat
maykinmedia · Oct 18, 2024 · 150eb66 · 150eb66
2 parents 7907cd7 + 89a542c
commit 150eb66
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 5 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.4.2
-appVersion: 1.7.0
+version: 1.5.0
+appVersion: 1.7.1
 
 dependencies:
   - name: redis

diff --git a/charts/opennotificaties/README.md b/charts/opennotificaties/README.md
@@ -1,6 +1,6 @@
 # opennotificaties
 
-![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.7.0](https://img.shields.io/badge/AppVersion-1.7.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.7.1](https://img.shields.io/badge/AppVersion-1.7.1-informational?style=flat-square)
 
 API voor het routeren van notificaties
 
@@ -32,6 +32,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` |  |
@@ -58,7 +71,7 @@ helm install my-release my-repo/opennotificaties
 | extraVerifyCerts | string | `""` | Path to extra certificates or CA (root) certificates, comma seperated Warning, If the file does not exist the pod(s) will not start |
 | extraVolumeMounts | list | `[]` | Optionally specify extra list of additional volumeMounts |
 | extraVolumes | list | `[]` | Optionally specify extra list of additional volumes |
-| flower.enabled | bool | `true` |  |
+| flower.enabled | bool | `false` |  |
 | flower.livenessProbe.failureThreshold | int | `6` |  |
 | flower.livenessProbe.initialDelaySeconds | int | `60` |  |
 | flower.livenessProbe.periodSeconds | int | `10` |  |

diff --git a/charts/opennotificaties/templates/deployment.yaml b/charts/opennotificaties/templates/deployment.yaml
@@ -310,3 +310,87 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
 {{- end }}
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "opennotificaties.beatFullname" . }}
+  labels:
+  {{- include "opennotificaties.beatLabels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.beat.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "opennotificaties.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 "opennotificaties.beatSelectorLabels" . | nindent 8 }}
+    {{- with .Values.beat.podLabels }}
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "opennotificaties.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ include "opennotificaties.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 "opennotificaties.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.existingSecret | default (include "opennotificaties.fullname" .) }}
+            - configMapRef:
+                name: {{ include "opennotificaties.fullname" . }}
+          resources:
+            {{- toYaml .Values.beat.resources | nindent 12 }}
+          command:
+            - /celery_beat.sh
+          volumeMounts:
+            - name: media
+              mountPath: /app/media
+              subPath: {{ .Values.persistence.mediaMountSubpath  | default "opennotificaties/media" }}
+            {{- if .Values.extraVolumeMounts }}
+            {{- include "opennotificaties.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 "opennotificaties.fullname" . }}{{- end }}
+          {{- else }}
+          emptyDir: { }
+          {{- end }}
+        {{- if .Values.extraVolumes }}
+        {{- include "opennotificaties.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/opennotificaties/values.yaml b/charts/opennotificaties/values.yaml
@@ -349,7 +349,7 @@ worker:
     targetMemoryUtilizationPercentage: 80
 
 flower:
-  enabled: true
+  enabled: false
   replicaCount: 1
   podLabels: {}
   livenessProbe:
@@ -366,6 +366,23 @@ 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 #
 ##################