Merge branch 'main' into renovate/shlink-backend-rabbitmq-12.x

christianhuth · Oct 4, 2023 · 0091120 · 0091120
2 parents 92556c7 + 3f6f378
commit 0091120
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 37 deletions.
diff --git a/charts/headwind-mdm/Chart.yaml b/charts/headwind-mdm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: headwind-mdm
 description: Headwind MDM - an open source mobile device management software for Android
 type: application
-version: 1.8.0
+version: 1.9.0
 appVersion: "0.1.2"
 home: https://github.com/christianknell/helm-charts
 icon: https://h-mdm.com/wp-content/uploads/2019/07/neew-logo.png
@@ -16,12 +16,14 @@ sources:
 dependencies:
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami
-    version: 12.10.0
+    version: 12.12.10
     condition: postgresql.enabled
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: bumped dependency of postgresql to chart version 12.10.0
+      description: bumped dependency of postgresql to chart version 12.12.10
+    - kind: fixed
+      description: wrong template name for postgresql dependency
   artifacthub.io/screenshots: |
     - title: Headwind MDM is a powerful Open Source platform to manage your Enterprise Android Devices.
       url: https://images.wondershare.com/drfone/article/2022/11/opensource-mdm-3.jpg

diff --git a/charts/headwind-mdm/templates/_helpers.tpl b/charts/headwind-mdm/templates/_helpers.tpl
@@ -66,7 +66,7 @@ Return the hostname of the postgresql to use
 */}}
 {{- define "headwind-mdm.postgresql.hostname" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.primary.fullname" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.primary.fullname" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.hostname $) -}}
   {{- end -}}
@@ -77,7 +77,7 @@ Return postgresql service port
 */}}
 {{- define "headwind-mdm.postgresql.port" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.service.port" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.service.port" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl (toString .Values.externalPostgresql.port) $) -}}
   {{- end -}}
@@ -88,7 +88,7 @@ Return the name for the database to use
 */}}
 {{- define "headwind-mdm.postgresql.database" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.database" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.database" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.database $) -}}
   {{- end -}}
@@ -99,7 +99,7 @@ Return the name for the user to use
 */}}
 {{- define "headwind-mdm.postgresql.username" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.username" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.username" .Subcharts.postgresql) -}}
   {{- else -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.username $) -}}
   {{- end -}}
@@ -110,7 +110,7 @@ Get the name of the secret containing the postgresql user password
 */}}
 {{- define "headwind-mdm.postgresql.secretName" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.secretName" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.secretName" .Subcharts.postgresql) -}}
   {{- else if .Values.externalPostgresql.auth.existingSecret -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.existingSecret $) -}}
   {{- else -}}
@@ -123,7 +123,7 @@ Get the user-password key for the postgresql user password
 */}}
 {{- define "headwind-mdm.postgresql.userPasswordKey" -}}
   {{- if .Values.postgresql.enabled -}}
-    {{- printf "%s" (include "postgresql.userPasswordKey" .Subcharts.postgresql) -}}
+    {{- printf "%s" (include "postgresql.v1.userPasswordKey" .Subcharts.postgresql) -}}
   {{- else if .Values.externalPostgresql.auth.userPasswordKey -}}
     {{- printf "%s" (tpl .Values.externalPostgresql.auth.userPasswordKey $) -}}
   {{- else -}}

diff --git a/charts/kube-ops-view/Chart.yaml b/charts/kube-ops-view/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: kube-ops-view
 description: A Helm chart for bootstrapping kube-ops-view.
 type: application
-version: 3.0.0
+version: 3.1.0
 appVersion: "23.5.0"
 home: https://github.com/christianknell/helm-charts
 icon: https://codeberg.org/repo-avatars/677-c51f6426305941cab515fdd98368f0bb
@@ -15,13 +15,13 @@ sources:
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami
-    version: 18.0.4
+    version: 18.1.1
     condition: redis.enabled
 annotations:
   artifacthub.io/category: monitoring-logging
   artifacthub.io/changes: |
     - kind: changed
-      description: bumped dependency of redis to chart 18.0.4
+      description: bumped dependency of redis to chart 18.1.1
   artifacthub.io/screenshots: |
     - title: Dashboard overview of a Kubernetes cluster
       url: https://codeberg.org/hjacobs/kube-ops-view/media/branch/main/screenshot.png

diff --git a/charts/kutt/Chart.yaml b/charts/kutt/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kutt
 description: Kutt is a free modern URL shortener.
 type: application
-version: 3.1.0
+version: 3.2.0
 appVersion: "v2.7.4"
 home: https://github.com/christianknell/helm-charts
 icon: https://www.saashub.com/images/app/service_logos/15/d634f2359578/large.png
@@ -18,14 +18,12 @@ dependencies:
     condition: postgresql.enabled
   - name: redis
     repository: https://charts.bitnami.com/bitnami
-    version: 18.0.4
+    version: 18.1.1
     condition: redis.enabled
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: bumped dependency of postgresql to chart 12.12.10
-    - kind: fixed
-      description: wrong template name for postgresql dependency
+      description: bumped dependency of redis to chart 18.1.1
   artifacthub.io/screenshots: |
     - title: Simply shorten your link using the Web UI.
       url: https://d4.alternativeto.net/v9sHosD3RiPblfBOOHZi0gwU1M0pRL6Jn53oiobJi9k/rs:fit:1200:1200:0/g:ce:0:0/YWJzOi8vZGlzdC9zL2t1dHQtaXRfNzY3MjMzX2Z1bGwucG5n.jpg

diff --git a/charts/netcupscp-exporter/Chart.yaml b/charts/netcupscp-exporter/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: netcupscp-exporter
 description: Prometheus Exporter for Netcup Server Control Panel (SCP)
 type: application
-version: 1.1.0
-appVersion: "v0.3.0"
+version: 1.1.1
+appVersion: "v0.3.2"
 home: https://github.com/christianknell/helm-charts
 icon: https://pbs.twimg.com/profile_images/1148537659637358593/rlfCvTK5_400x400.png
 maintainers:
@@ -13,6 +13,9 @@ sources:
   - https://github.com/mrueg/netcupscp-exporter
 annotations:
   artifacthub.io/category: monitoring-logging
+  artifacthub.io/changes: |
+    - kind: changed
+      description: bumped image version to v0.3.2
   artifacthub.io/screenshots: |
     - title: Export information about your Servers from Netcup SCP as Prometheus metrics.
       url: https://www.netcup-wiki.de/images/SCP-Willkommen.png

diff --git a/charts/netcupscp-exporter/README.md b/charts/netcupscp-exporter/README.md
@@ -58,7 +58,7 @@ The command removes all the Kubernetes components associated with the chart and
 | image.pullPolicy                           | string | `"Always"`                   | image pull policy                                                                                                      |
 | image.registry                             | string | `"ghcr.io"`                  | image registry                                                                                                         |
 | image.repository                           | string | `"mrueg/netcupscp-exporter"` | image repository                                                                                                       |
-| image.tag                                  | string | `"v0.3.0"`                   | Overrides the image tag                                                                                                |
+| image.tag                                  | string | `"v0.3.2"`                   | Overrides the image tag                                                                                                |
 | imagePullSecrets                           | list   | `[]`                         | If defined, uses a Secret to pull an image from a private Docker registry or repository.                               |
 | ingress.annotations                        | object | `{}`                         |                                                                                                                        |
 | ingress.className                          | string | `""`                         |                                                                                                                        |

diff --git a/charts/netcupscp-exporter/values.yaml b/charts/netcupscp-exporter/values.yaml
@@ -11,7 +11,7 @@ image:
   # -- image pull policy
   pullPolicy: Always
   # -- Overrides the image tag
-  tag: "v0.3.0"
+  tag: "v0.3.2"
 
 # -- If defined, uses a Secret to pull an image from a private Docker registry or repository.
 imagePullSecrets: []

diff --git a/charts/shlink-backend/Chart.yaml b/charts/shlink-backend/Chart.yaml
@@ -3,7 +3,7 @@ name: shlink-backend
 description: A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain.
 type: application
 version: 2.13.0
-appVersion: "3.6.3"
+appVersion: "3.6.4"
 home: https://github.com/christianknell/helm-charts
 icon: https://shlink.io/images/shlink-logo-blue.svg
 maintainers:

diff --git a/charts/shlink-backend/README.md b/charts/shlink-backend/README.md
@@ -58,7 +58,7 @@ The command removes all the Kubernetes components associated with the chart and
 | fullnameOverride                           | string | `""`                       | String to fully override `"shlink-backend.fullname"`                                                                   |
 | image.pullPolicy                           | string | `"Always"`                 | image pull policy                                                                                                      |
 | image.repository                           | string | `"shlinkio/shlink"`        | image repository                                                                                                       |
-| image.tag                                  | string | `"3.6.3"`                  | Overrides the image tag                                                                                                |
+| image.tag                                  | string | `"3.6.4"`                  | Overrides the image tag                                                                                                |
 | imagePullSecrets                           | list   | `[]`                       | If defined, uses a Secret to pull an image from a private Docker registry or repository.                               |
 | ingress.annotations                        | object | `{}`                       |                                                                                                                        |
 | ingress.className                          | string | `""`                       |                                                                                                                        |

diff --git a/charts/shlink-backend/templates/deployment.yaml b/charts/shlink-backend/templates/deployment.yaml
@@ -81,18 +81,18 @@ spec:
             - name: DB_DRIVER
               value: postgres
             - name: DB_HOST
-              value: {{ include "postgresql.primary.fullname" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.primary.fullname" .Subcharts.postgresql }}
             - name: DB_PORT
-              value: {{ include "postgresql.service.port" .Subcharts.postgresql | quote }}
+              value: {{ include "postgresql.v1.service.port" .Subcharts.postgresql | quote }}
             - name: DB_NAME
-              value: {{ include "postgresql.database" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.database" .Subcharts.postgresql }}
             - name: DB_USER
-              value: {{ include "postgresql.username" .Subcharts.postgresql }}
+              value: {{ include "postgresql.v1.username" .Subcharts.postgresql }}
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "postgresql.secretName" .Subcharts.postgresql }}
-                  key: {{ template "postgresql.userPasswordKey" .Subcharts.postgresql }}
+                  name: {{ template "postgresql.v1.secretName" .Subcharts.postgresql }}
+                  key: {{ template "postgresql.v1.userPasswordKey" .Subcharts.postgresql }}
             {{- end }}
             # RabbitMQ Settings
             {{- if .Values.rabbitmq.enabled }}

diff --git a/charts/shlink-backend/values.yaml b/charts/shlink-backend/values.yaml
@@ -9,7 +9,7 @@ image:
   # -- image pull policy
   pullPolicy: Always
   # -- Overrides the image tag
-  tag: "3.6.3"
+  tag: "3.6.4"
 
 # -- If defined, uses a Secret to pull an image from a private Docker registry or repository.
 imagePullSecrets: []

diff --git 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
@@ -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 -}}