Merge pull request #20 from tamcore/feature/flavor

add image.flavor

README.md

@@ -24,3 +24,16 @@ The command removes all the Kubernetes components associated with the deplyoment
 
 ### Parameters
 The chart incorporates every configuration file setting, which can be found [ here](https://www.traccar.org/configuration-file/)
+
+### Image flavors
+The [traccar container image](https://github.com/traccar/traccar-docker) comes in _different flavors_. Currently available are
+* alpine
+* debian
+* ubuntu
+If none is specified during installation of this chart, the default is alpine based.
+
+To set your preferred flavor, you can use `--set image.flavor=debian` for example, or, for more reusability, append the following lines to your installation's `values.yaml`
+```yaml
+image:
+  flavor: "debian"
+```

charts/traccar/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: traccar
 description: A Helm chart for Traccar GPS Server
 type: application
-version: 1.3.0
+version: 1.4.0
 appVersion: "5.6"
 dependencies:
   - name: mysql

charts/traccar/templates/_helpers.tpl

@@ -60,3 +60,12 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "traccar.image" -}}
+{{- $tag := .Values.image.tag | default .Chart.AppVersion }}
+{{- if .Values.image.flavor }}
+{{- printf "%s:%s-%s" .Values.image.repository $tag .Values.image.flavor }}
+{{- else }}
+{{- printf "%s:%s" .Values.image.repository $tag }}
+{{- end }}
+{{- end }}

charts/traccar/templates/deployment.yaml

@@ -59,7 +59,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "traccar.image" . }}
           command: ["java", "-Xms512m", "-Xmx512m", "-Djava.net.preferIPv4Stack=true"]
           args: ["-jar", "tracker-server.jar", "conf/traccar.xml"]
           imagePullPolicy: {{ .Values.image.pullPolicy }}

charts/traccar/values.yaml

@@ -118,6 +118,7 @@ mysql:
 image:
   repository: traccar/traccar
   pullPolicy: IfNotPresent
+  # flavor: "" # available are alpine, debian or ubuntu
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""