Configure external redis

traccar · Jan 7, 2024 · b94c1b4 · b94c1b4
1 parent 246dede
commit b94c1b4
Show file tree

Hide file tree

Showing 6 changed files with 701 additions and 687 deletions.
diff --git a/charts/traccar/Chart.yaml b/charts/traccar/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: traccar
 description: A Helm chart for Traccar GPS Server
 type: application
-version: 1.8.0
+version: 1.9.0
 appVersion: "5.10"
 dependencies:
   - name: mysql

diff --git a/charts/traccar/Makefile b/charts/traccar/Makefile
@@ -2,3 +2,4 @@ generate-template:
 	rm -rf ./manifests || true
 	helm template test-values . -f ./ci/test-values.yaml --namespace default --output-dir ./manifests/test-test --include-crds
 	helm template traccar-default . -f values.yaml --namespace default --output-dir ./manifests/traccar-default --include-crds
+	helm template traccar-redis-ha . -f ./ci/ha-with-redis-values.yaml --namespace default --output-dir ./manifests/traccar-redis-ha --include-crds
diff --git a/charts/traccar/templates/_helpers.tpl b/charts/traccar/templates/_helpers.tpl
@@ -69,3 +69,16 @@ Create the name of the service account to use
 {{- printf "%s:%s" .Values.image.repository $tag }}
 {{- end }}
 {{- end }}
+
+{{- define "traccar.deploymentStrategy" -}}
+{{- if or (.Values.traccar.broadcast.enabled) (index .Values "redis-ha").enabled }}
+strategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxSurge: {{.Values.deploymentStrategy.maxSurge | default "25%" | quote }}
+    maxUnavailable: {{.Values.deploymentStrategy.maxUnavailable | default "25%" | quote }}
+{{- else }}
+strategy:
+  type: Recreate
+{{- end }}
+{{- end }}
diff --git a/charts/traccar/templates/configmap.yaml b/charts/traccar/templates/configmap.yaml
@@ -139,7 +139,7 @@ data:
         <entry key='logger.file'>/dev/stdout</entry>
         <entry key='logger.rotate'>false</entry>
 {{- end }}
-{{ else }}
+{{- else }}
         <entry key='logger.enable'>false</entry>
 {{- end }}
 
@@ -362,7 +362,6 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
-
 {{- if .Values.traccar.notificator }}
 {{- if .Values.traccar.notificator.types }}
         <entry key='notificator.types'>{{ .Values.traccar.notificator.types }}</entry>
@@ -392,6 +391,10 @@ data:
 {{- if (index .Values "redis-ha").enabled }}
         <entry key='broadcast.type'>redis</entry>
         <entry key='broadcast.address'>redis://{{ include "traccar.fullname" . }}-redis-ha-haproxy:6379</entry>
+{{- end }}
+{{- if and (.Values.traccar.broadcast.enabled) (not (index .Values "redis-ha").enabled) }}
+        <entry key='broadcast.type'>redis</entry>
+        <entry key='broadcast.address'>{{ .Values.traccar.broadcast.address }}</entry>
 {{- end }}
     </properties>
 {{- end }}
diff --git a/charts/traccar/templates/deployment.yaml b/charts/traccar/templates/deployment.yaml
@@ -11,10 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "traccar.selectorLabels" . | nindent 6 }}
-  {{- with .Values.deploymentStrategy }}
-  strategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+  {{- include "traccar.deploymentStrategy" . | nindent 2 }}
   template:
     metadata:
       annotations: