feat(plausible): support customizing the mount path of the geoip data…

…base
pascaliske · Nov 22, 2023 · 07dd4ef · 07dd4ef
1 parent 5174848
commit 07dd4ef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/charts/plausible/Chart.yaml b/charts/plausible/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 type: application
 name: plausible
 description: A Helm chart for Plausible
-version: 1.0.0
+version: 1.1.0
 # renovate: image=plausible/analytics
 appVersion: "v2.0.0"
 
@@ -29,9 +29,5 @@ dependencies:
 
 annotations:
   artifacthub.io/changes: |-
-    - kind: removed
-      description: 'Remove support for CRDs from "traefik.containo.us".'
     - kind: added
-      description: 'Add support for CRDs from "traefik.io".'
-    - kind: changed
-      description: 'Switch to GHCR based image for GeoIP database.'
+      description: 'Add support for customizing the mount path of the GeoIP database.'
diff --git a/charts/plausible/README.md b/charts/plausible/README.md
@@ -2,7 +2,7 @@
 
 > A Helm chart for Plausible
 
-[![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)[![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)[![AppVersion: v2.0.0](https://img.shields.io/badge/AppVersion-v2.0.0-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)
+[![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)[![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)[![AppVersion: v2.0.0](https://img.shields.io/badge/AppVersion-v2.0.0-informational?style=flat-square) ](https://charts.pascaliske.dev/charts/plausible/)
 
 * <https://github.com/pascaliske/helm-charts>
 * <https://github.com/plausible/analytics>
@@ -62,6 +62,7 @@ The following values can be used to adjust the helm chart.
 | geoip.image.repository | string | `"ghcr.io/maxmind/geoipupdate"` | The repository for the geoip image. |
 | geoip.image.tag | string | `"v6.0.0"` | The docker tag for the geoip image. |
 | geoip.licenseKey | string | `""` | Required. Case-sensitive MaxMind license key. |
+| geoip.mountPath | string | `"/geoip"` | Optional. Specify the database mount path inside the containers. |
 | image.pullPolicy | string | `"IfNotPresent"` | The pull policy for the controller. |
 | image.repository | string | `"plausible/analytics"` | The repository to pull the image from. |
 | image.tag | string | `.Chart.AppVersion` | The docker tag, if left empty chart's appVersion will be used. |

diff --git a/charts/plausible/templates/controller.yaml b/charts/plausible/templates/controller.yaml
@@ -76,12 +76,12 @@ spec:
             {{- end }}
             {{- if .Values.geoip.enabled }}
             - name: GEOLITE2_COUNTRY_DB
-              value: /geoip/GeoLite2-Country.mmdb
+              value: {{ default "/geoip" .Values.geoip.mountPath }}/GeoLite2-Country.mmdb
             {{- end }}
           {{- if .Values.geoip.enabled }}
           volumeMounts:
             - name: geoip-volume
-              mountPath: /geoip
+              mountPath: {{ default "/geoip" .Values.geoip.mountPath | quote }}
               readOnly: true
           {{- end }}
           livenessProbe:
@@ -101,6 +101,8 @@ spec:
           image: "{{ .Values.geoip.image.repository }}:{{ .Values.geoip.image.tag }}"
           imagePullPolicy: IfNotPresent
           env:
+            - name: GEOIPUPDATE_DB_DIR
+              value: {{ default "/geoip" .Values.geoip.mountPath | quote }}
             - name: GEOIPUPDATE_ACCOUNT_ID
               value: {{ .Values.geoip.accountId | quote }}
             - name: GEOIPUPDATE_LICENSE_KEY
@@ -111,7 +113,7 @@ spec:
               value: GeoLite2-Country
           volumeMounts:
             - name: geoip-volume
-              mountPath: /usr/share/GeoIP
+              mountPath: {{ default "/geoip" .Values.geoip.mountPath | quote }}
         {{- end }}
       {{- if .Values.geoip.enabled }}
       volumes:

diff --git a/charts/plausible/values.yaml b/charts/plausible/values.yaml
@@ -113,6 +113,8 @@ geoip:
   licenseKey: ''
   # -- Optional. Database update frequency. Defaults to "168" which equals 7 days.
   frequency: 168
+  # -- Optional. Specify the database mount path inside the containers.
+  mountPath: /geoip
 
 serviceAccount:
   # -- Specify the service account used for the controller.