From 711f6c53a660d4ffab44bb46b405d8d696fd5c8e Mon Sep 17 00:00:00 2001 From: Philipp Born Date: Sat, 11 Feb 2023 13:12:38 +0100 Subject: [PATCH] make command, args and env configurable --- charts/traccar/Chart.yaml | 2 +- charts/traccar/templates/deployment.yaml | 14 ++++++++++++-- charts/traccar/values.yaml | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/charts/traccar/Chart.yaml b/charts/traccar/Chart.yaml index fb8562c..fae67b8 100644 --- 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.4.0 +version: 1.5.0 appVersion: "5.6" dependencies: - name: mysql diff --git a/charts/traccar/templates/deployment.yaml b/charts/traccar/templates/deployment.yaml index 7027ef4..fd80a4e 100644 --- a/charts/traccar/templates/deployment.yaml +++ b/charts/traccar/templates/deployment.yaml @@ -60,8 +60,18 @@ spec: securityContext: {{- toYaml .Values.securityContext | nindent 12 }} image: {{ include "traccar.image" . }} - command: ["java", "-Xms512m", "-Xmx512m", "-Djava.net.preferIPv4Stack=true"] - args: ["-jar", "tracker-server.jar", "conf/traccar.xml"] + {{- with .Values.command }} + command: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.args }} + args: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.env }} + env: + {{- toYaml . | nindent 12 }} + {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http diff --git a/charts/traccar/values.yaml b/charts/traccar/values.yaml index 0119388..ad88183 100644 --- a/charts/traccar/values.yaml +++ b/charts/traccar/values.yaml @@ -151,6 +151,25 @@ securityContext: # A list of initContainers to run before the pod starts initContainers: [] +command: ["java", "-Xms512m", "-Xmx512m", "-Djava.net.preferIPv4Stack=true"] +args: ["-jar", "tracker-server.jar", "conf/traccar.xml"] + +# This allows you to use environment variables (i.e. referenced from Secrets) to use in your configuration +# The names of the keys are identical. But, a dot (.), you'll have to use an underscore (_) and define everything in UPPERCASE +env: [] +# - name: "CONFIG_USE_ENVIRONMENT_VARIABLES" +# value: "true" +# - name: "DATABASE_USER" +# valueFrom: +# secretKeyRef: +# name: "postgres-secrets" +# key: "username" +# - name: "DATABASE_PASSWORD" +# valueFrom: +# secretKeyRef: +# name: "postgres-secrets" +# key: "password" + ingress: enabled: false extraAnnotations: {}