Merge pull request #35 from Digitalist-Open-Cloud/ingress_class_bump_…

…matomo

Ingress class bump matomo

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change log
 
+## [11.0.39] - 2024-10-01
+
+### Added
+
+- Possibility to set ingressClassName
+- Set app to 5.1.2 of Matomo
+
 ## [11.0.38] - 2024-09-18
 
 ### Added

charts/matomo/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "5.1.1"
+appVersion: "5.1.2"
 description: A Helm chart for Matomo
 name: matomo
-version: 11.0.38
+version: 11.0.39

charts/matomo/templates/ingress-matomo-dashboard.yaml

@@ -25,6 +25,9 @@ metadata:
     {{ else }}
   {{- end }}
 spec:
+  {{- if .Values.matomo.dashboard.ingressClassName }}
+  ingressClassName: {{.Values.matomo.dashboard.ingressClassName}}
+  {{- end }}
   rules:
   - host: {{.Values.matomo.dashboard.hostname}}
     http:

charts/matomo/templates/ingress-matomo-tracker.yaml

@@ -29,6 +29,9 @@ metadata:
       {{- end }}
     {{- end }}
 spec:
+  {{- if .Values.matomo.tracker.ingressClassName }}
+  ingressClassName: {{.Values.matomo.tracker.ingressClassName}}
+  {{- end }}
   rules:
   - host: {{.Values.matomo.tracker.hostname}}
     http:

charts/matomo/values.yaml

@@ -22,7 +22,7 @@ matomo:
   ## imagePullSecrets:
   ##   - myRegistryKeySecretName
   imagePullSecrets: []
-  image: digitalist/matomo:5.1.1
+  image: digitalist/matomo:5.1.2
   runAsUser: 82
   installCommand: ./console plugin:activate ExtraTools && ./console matomo:install --install-file=/tmp/matomo/install.json --force --do-not-drop-db
   # Post install for helm chart. Starts a post-install-job.
@@ -43,8 +43,7 @@ matomo:
     enabled: true
     extralabels: {}
     annotations:
-      digitalist-net-services.org: "matomo"
-      kubernetes.io/ingress.class: "nginx"
+      digitalist.cloud/instance: "matomo"
   cli:
     replicas: 1
     enabled: true
@@ -98,6 +97,7 @@ matomo:
       email: [email protected]
     nginx:
       nginxWorkerProcesses: 5
+    ingressClassName: ""
   queuedTrackingMonitor:
     enabled: true
   queuedTrackingProcess:
@@ -116,6 +116,7 @@ matomo:
       max_children: 75
       process_idle_timeout: 600s
       max_requests: 500
+    ingressClassName: ""
 nginx:
   image: digitalist/nginx:1.21.6
   imagePullSecrets: []