diff --git a/charts/umami/Chart.yaml b/charts/umami/Chart.yaml index c9c7d215..150f86d3 100644 --- a/charts/umami/Chart.yaml +++ b/charts/umami/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: umami description: Umami is a simple, fast, privacy-focused alternative to Google Analytics. type: application -version: 1.19.1 +version: 1.20.0 appVersion: "postgresql-v1.40.0" home: https://github.com/christianknell/helm-charts icon: https://raw.githubusercontent.com/umami-software/umami/master/public/android-chrome-512x512.png @@ -15,7 +15,7 @@ sources: dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 12.10.0 + version: 12.12.10 condition: postgresql.enabled - name: mysql repository: https://charts.bitnami.com/bitnami @@ -25,7 +25,9 @@ annotations: artifacthub.io/category: monitoring-logging artifacthub.io/changes: | - kind: changed - description: bumped chart version of mysql to 9.12.3 + description: bumped chart version of postgresql to 12.12.10 + - kind: changed + description: template names of postgresql artifacthub.io/screenshots: | - title: Umami measures just the important metrics that you care about and everything is displayed on a single, easy to browse page. url: https://umami.is/images/feature-website-stats.png diff --git a/charts/umami/templates/_helpers.tpl b/charts/umami/templates/_helpers.tpl index 15a3cd29..52c45d12 100644 --- a/charts/umami/templates/_helpers.tpl +++ b/charts/umami/templates/_helpers.tpl @@ -66,7 +66,7 @@ Return the hostname of the database to use */}} {{- define "umami.database.hostname" -}} {{- if .Values.postgresql.enabled -}} - {{- printf "%s" (include "postgresql.primary.fullname" .Subcharts.postgresql) -}} + {{- printf "%s" (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) -}} {{- else if .Values.mysql.enabled -}} {{- printf "%s" (include "mysql.primary.fullname" .Subcharts.mysql) -}} {{- else -}} @@ -79,7 +79,7 @@ Return database service port */}} {{- define "umami.database.port" -}} {{- if .Values.postgresql.enabled -}} - {{- printf "%s" (include "postgresql.service.port" .Subcharts.postgresql) -}} + {{- printf "%s" (include "postgresql.v1.service.port" .Subcharts.postgresql) -}} {{- else if .Values.mysql.enabled -}} {{- printf "%s" (tpl (toString .Values.mysql.primary.service.ports.mysql) $) -}} {{- else -}} @@ -92,7 +92,7 @@ Return the name for the database to use */}} {{- define "umami.database.database" -}} {{- if .Values.postgresql.enabled -}} - {{- printf "%s" (include "postgresql.database" .Subcharts.postgresql) -}} + {{- printf "%s" (include "postgresql.v1.database" .Subcharts.postgresql) -}} {{- else if .Values.mysql.enabled -}} {{- printf "%s" (tpl .Values.mysql.auth.database $) -}} {{- else -}} @@ -105,7 +105,7 @@ Return the name for the user to use */}} {{- define "umami.database.username" -}} {{- if .Values.postgresql.enabled -}} - {{- printf "%s" (include "postgresql.username" .Subcharts.postgresql) -}} + {{- printf "%s" (include "postgresql.v1.username" .Subcharts.postgresql) -}} {{- else if .Values.mysql.enabled -}} {{- printf "%s" (tpl .Values.mysql.auth.username $) -}} {{- else -}}