Update helm/chart-testing-action action to v2.8.0

2025-12-26 23:03:01 +00:00
26 changed files with 170 additions and 82 deletions
--- a/.gitea/workflows/lint-test.yaml
+++ b/.gitea/workflows/lint-test.yaml
@@ -42,7 +42,7 @@ jobs:
          python-version: '3.14'

      - name: Set up Chart Testing
-        uses: helm/chart-testing-action@v2.7.0
+        uses: helm/chart-testing-action@v2.8.0
        with:
          yamale_version: "6.0.0"

--- a/charts/cloudflared/Chart.lock
+++ b/charts/cloudflared/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.6.0
-digest: sha256:a1675afcbd6e7a3d61fd241f646271c1975ef24f37d2d8cd56a8ff3e48bed794
-generated: "2026-01-08T14:57:38.964824-06:00"
+  version: 4.5.0
+digest: sha256:cd050e107fbec6769024a6d316c3f43701295a55cddf53a9fc304b52ea879560
+generated: "2025-12-04T18:06:50.235715-06:00"
--- a/charts/cloudflared/Chart.yaml
+++ b/charts/cloudflared/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.1.6
+version: 2.1.4
 description: Cloudflared Tunnel
 keywords:
  - cloudflare
@@ -13,6 +13,6 @@ maintainers:
 dependencies:
  - name: common
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.6.0
+    version: 4.5.0
 icon: https://avatars.githubusercontent.com/u/314135?s=48&v=4
 appVersion: "2025.11.1"
--- a/charts/cloudflared/README.md
+++ b/charts/cloudflared/README.md
@@ -1,6 +1,6 @@
 # cloudflared

-![Version: 2.1.6](https://img.shields.io/badge/Version-2.1.6-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
+![Version: 2.1.4](https://img.shields.io/badge/Version-2.1.4-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)

 Cloudflared Tunnel

@@ -19,7 +19,7 @@ Cloudflared Tunnel

 | Repository | Name | Version |
 |------------|------|---------|
-| https://bjw-s-labs.github.io/helm-charts/ | common | 4.6.0 |
+| https://bjw-s-labs.github.io/helm-charts/ | common | 4.5.0 |

 ## Values

--- a/charts/generic-device-plugin/Chart.lock
+++ b/charts/generic-device-plugin/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.6.0
-digest: sha256:a1675afcbd6e7a3d61fd241f646271c1975ef24f37d2d8cd56a8ff3e48bed794
-generated: "2026-01-08T14:57:09.560708-06:00"
+  version: 4.5.0
+digest: sha256:cd050e107fbec6769024a6d316c3f43701295a55cddf53a9fc304b52ea879560
+generated: "2025-12-04T18:08:17.823318-06:00"
--- a/charts/generic-device-plugin/Chart.yaml
+++ b/charts/generic-device-plugin/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: generic-device-plugin
-version: 0.20.12
+version: 0.20.9
 description: Generic Device Plugin
 keywords:
  - generic-device-plugin
@@ -14,5 +14,5 @@ maintainers:
 dependencies:
  - name: common
    repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.6.0
-appVersion: 0.20.12
+    version: 4.5.0
+appVersion: 0.20.4
--- a/charts/generic-device-plugin/README.md
+++ b/charts/generic-device-plugin/README.md
@@ -1,6 +1,6 @@
 # generic-device-plugin

-![Version: 0.20.12](https://img.shields.io/badge/Version-0.20.12-informational?style=flat-square) ![AppVersion: 0.20.12](https://img.shields.io/badge/AppVersion-0.20.12-informational?style=flat-square)
+![Version: 0.20.9](https://img.shields.io/badge/Version-0.20.9-informational?style=flat-square) ![AppVersion: 0.20.4](https://img.shields.io/badge/AppVersion-0.20.4-informational?style=flat-square)

 Generic Device Plugin

@@ -19,7 +19,7 @@ Generic Device Plugin

 | Repository | Name | Version |
 |------------|------|---------|
-| https://bjw-s-labs.github.io/helm-charts/ | common | 4.6.0 |
+| https://bjw-s-labs.github.io/helm-charts/ | common | 4.5.0 |

 ## Values

@@ -28,7 +28,7 @@ Generic Device Plugin
 | config | object | `{"data":"devices:\n  - name: serial\n    groups:\n      - paths:\n          - path: /dev/ttyUSB*\n      - paths:\n          - path: /dev/ttyACM*\n      - paths:\n          - path: /dev/tty.usb*\n      - paths:\n          - path: /dev/cu.*\n      - paths:\n          - path: /dev/cuaU*\n      - paths:\n          - path: /dev/rfcomm*\n  - name: video\n    groups:\n      - paths:\n          - path: /dev/video0\n  - name: fuse\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/fuse\n  - name: audio\n    groups:\n      - count: 10\n        paths:\n          - path: /dev/snd\n  - name: capture\n    groups:\n      - paths:\n          - path: /dev/snd/controlC0\n          - path: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC1\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC1D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC2\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC2D0c\n            mountPath: /dev/snd/pcmC0D0c\n      - paths:\n          - path: /dev/snd/controlC3\n            mountPath: /dev/snd/controlC0\n          - path: /dev/snd/pcmC3D0c\n            mountPath: /dev/snd/pcmC0D0c\n","enabled":true}` | Config map |
 | config.data | string | See [values.yaml](./values.yaml) | generic-device-plugin config file [[ref]](https://github.com/squat/generic-device-plugin#usage) |
 | deviceDomain | string | `"devic.es"` | Domain used by devices for identifcation |
-| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:f1055553438c495c5258c4648a83f6aaf0a3c908d0c5313302ddf0feaa1758bd"}` | Default image |
+| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:2b53d255017668d70d7f59ff0b874a66c3a50922d1f8cfff182e4c55b82251a1"}` | Default image |
 | name | string | `"generic-device-plugin"` | Name override of release |
 | resources | object | `{"requests":{"cpu":"50m","memory":"10Mi"}}` | Default resources |
 | service | object | `{"listenPort":8080}` | Service port |
--- a/charts/generic-device-plugin/values.yaml
+++ b/charts/generic-device-plugin/values.yaml
@@ -4,7 +4,7 @@ name: generic-device-plugin
 # -- Default image
 image:
  repository: ghcr.io/squat/generic-device-plugin
-  tag: latest@sha256:f1055553438c495c5258c4648a83f6aaf0a3c908d0c5313302ddf0feaa1758bd
+  tag: latest@sha256:2b53d255017668d70d7f59ff0b874a66c3a50922d1f8cfff182e4c55b82251a1
  pullPolicy: Always

 # -- Domain used by devices for identifcation
--- a/charts/postgres-cluster/Chart.yaml
+++ b/charts/postgres-cluster/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 7.4.5
+version: 7.4.4
 description: Cloudnative-pg Cluster
 keywords:
  - database
--- a/charts/postgres-cluster/README.md
+++ b/charts/postgres-cluster/README.md
@@ -1,6 +1,6 @@
 # postgres-cluster

-![Version: 7.4.5](https://img.shields.io/badge/Version-7.4.5-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)
+![Version: 7.4.4](https://img.shields.io/badge/Version-7.4.4-informational?style=flat-square) ![AppVersion: v1.28.0](https://img.shields.io/badge/AppVersion-v1.28.0-informational?style=flat-square)

 Cloudnative-pg Cluster

--- a/charts/postgres-cluster/prometheus_rules/cluster-backends_waiting-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-backends_waiting-warning.yaml
@@ -7,7 +7,7 @@ annotations:
    Pod {{`{{`}} $labels.pod {{`}}`}}
    has been waiting for longer than 5 minutes
 expr: |
-  cnpg_backends_waiting_total{namespace="{{ .namespace }}"} > 300
+  cnpg_backends_waiting_total > 300
 for: 1m
 labels:
  severity: warning
--- a/charts/postgres-cluster/prometheus_rules/cluster-database_deadlock_conflicts-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-database_deadlock_conflicts-warning.yaml
@@ -7,7 +7,7 @@ annotations:
    There are over 10 deadlock conflicts in
    {{`{{`}} $labels.pod {{`}}`}}
 expr: |
-  cnpg_pg_stat_database_deadlocks{namespace="{{ .namespace }}"} > 10
+  cnpg_pg_stat_database_deadlocks > 10
 for: 1m
 labels:
  severity: warning
--- a/charts/postgres-cluster/prometheus_rules/cluster-last_failed_archive_time-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-last_failed_archive_time-warning.yaml
@@ -6,7 +6,7 @@ annotations:
  description: |-
    Archiving failed for {{`{{`}} $labels.pod {{`}}`}}
 expr: |
-  (cnpg_pg_stat_archiver_last_failed_time{namespace="{{ .namespace }}"} - cnpg_pg_stat_archiver_last_archived_time{namespace="{{ .namespace }}"}) > 2
+  (cnpg_pg_stat_archiver_last_failed_time - cnpg_pg_stat_archiver_last_archived_time) > 2
 for: 1m
 labels:
  severity: warning
--- a/charts/postgres-cluster/prometheus_rules/cluster-long_running_transaction-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-long_running_transaction-warning.yaml
@@ -7,7 +7,7 @@ annotations:
    CloudNativePG Cluster Pod {{`{{`}} $labels.pod {{`}}`}}
    is taking more than 5 minutes (300 seconds) for a query.
 expr: |-
-  cnpg_backends_max_tx_duration_seconds{namespace="{{ .namespace }}"} > 300
+  cnpg_backends_max_tx_duration_seconds > 300
 for: 1m
 labels:
  severity: warning
--- a/charts/postgres-cluster/prometheus_rules/cluster-pg_database_xid_age-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-pg_database_xid_age-warning.yaml
@@ -7,7 +7,7 @@ annotations:
    Over 300,000,000 transactions from frozen xid
    on pod {{`{{`}} $labels.pod {{`}}`}}
 expr: |
-  cnpg_pg_database_xid_age{namespace="{{ .namespace }}"} > 300000000
+  cnpg_pg_database_xid_age > 300000000
 for: 1m
 labels:
  severity: warning
--- a/charts/postgres-cluster/prometheus_rules/cluster-replica_failing_replication-warning.yaml
+++ b/charts/postgres-cluster/prometheus_rules/cluster-replica_failing_replication-warning.yaml
@@ -7,7 +7,7 @@ annotations:
    Replica {{`{{`}} $labels.pod {{`}}`}}
    is failing to replicate
 expr: |
-  cnpg_pg_replication_in_recovery{namespace="{{ .namespace }}"} > cnpg_pg_replication_is_wal_receiver_up{namespace="{{ .namespace }}"}
+  cnpg_pg_replication_in_recovery > cnpg_pg_replication_is_wal_receiver_up
 for: 1m
 labels:
  severity: warning
--- a/charts/redis-replication/Chart.yaml
+++ b/charts/redis-replication/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: redis-replication
-version: 1.0.0
+version: 0.5.0
 description: Redis Replication with Sentinel
 keywords:
  - redis-operator
@@ -12,4 +12,4 @@ sources:
 maintainers:
  - name: alexlebens
 icon: https://github.com/OT-CONTAINER-KIT/redis-operator/raw/main/static/redis-operator-logo.svg
-appVersion: v0.23.0
+appVersion: v0.21.0
--- a/charts/redis-replication/README.md
+++ b/charts/redis-replication/README.md
@@ -1,6 +1,6 @@
 # redis-replication

-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: v0.23.0](https://img.shields.io/badge/AppVersion-v0.23.0-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![AppVersion: v0.21.0](https://img.shields.io/badge/AppVersion-v0.21.0-informational?style=flat-square)

 Redis Replication with Sentinel

@@ -22,16 +22,19 @@ Redis Replication with Sentinel
 | additionalLabels | object | `{}` | Add additional labels |
 | existingSecret | object | `{"enabled":false,"key":"password","name":"secret-name"}` | Password |
 | namespaceOverride | string | `""` | Override the namespace of the chart |
-| redisReplication | object | `{"clusterSize":3,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis","tag":"v8.4.0"},"podSecurityContext":{"fsGroup":1000,"runAsUser":1000},"redisExporter":{"enabled":true,"image":{"repository":"quay.io/opstree/redis-exporter","tag":"v1.80.1"},"serviceMonitor":{"enabled":true,"extraLabels":{},"interval":"30s","scrapeTimeout":"10s"}},"resources":{"requests":{"cpu":"10m","memory":"32Mi"}},"sentinel":{"enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis-sentinel","tag":"v8.4.0"},"resources":{"requests":{"cpu":"10m","memory":"32Mi"}},"size":3},"volumeClaimTemplate":{"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"1Gi"}},"storageClassName":"ceph-block"}}}` | Redis Replication settings |
+| redisReplication | object | `{"clusterSize":3,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis","tag":"v8.4.0"},"podSecurityContext":{"fsGroup":1000,"runAsUser":1000},"redisExporter":{"enabled":true,"image":{"repository":"quay.io/opstree/redis-exporter","tag":"v1.80.1"},"serviceMonitor":{"enabled":true,"extraLabels":{},"interval":"30s","scrapeTimeout":"10s"}},"resources":{"requests":{"cpu":"10m","memory":"32Mi"}},"volumeClaimTemplate":{"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"1Gi"}},"storageClassName":"ceph-block"}}}` | Redis Replication settings |
 | redisReplication.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis","tag":"v8.4.0"}` | Image |
 | redisReplication.podSecurityContext | object | `{"fsGroup":1000,"runAsUser":1000}` | Security |
 | redisReplication.redisExporter | object | `{"enabled":true,"image":{"repository":"quay.io/opstree/redis-exporter","tag":"v1.80.1"},"serviceMonitor":{"enabled":true,"extraLabels":{},"interval":"30s","scrapeTimeout":"10s"}}` | Metrics |
 | redisReplication.resources | object | `{"requests":{"cpu":"10m","memory":"32Mi"}}` | Resources |
-| redisReplication.sentinel | object | `{"enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis-sentinel","tag":"v8.4.0"},"resources":{"requests":{"cpu":"10m","memory":"32Mi"}},"size":3}` | Redis Sentinel settings |
-| redisReplication.sentinel.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis-sentinel","tag":"v8.4.0"}` | Image |
-| redisReplication.sentinel.resources | object | `{"requests":{"cpu":"10m","memory":"32Mi"}}` | Resources |
 | redisReplication.volumeClaimTemplate | object | `{"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"1Gi"}},"storageClassName":"ceph-block"}}` | Storage |
+| redisSentinel | object | `{"clusterSize":3,"enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis-sentinel","tag":"v8.4.0"},"podSecurityContext":{"fsGroup":1000,"runAsUser":1000},"redisExporter":{"enabled":true,"image":{"repository":"quay.io/opstree/redis-exporter","tag":"v1.80.1"},"serviceMonitor":{"enabled":true,"extraLabels":{},"interval":"30s","scrapeTimeout":"10s"}},"resources":{"requests":{"cpu":"10m","memory":"32Mi"}}}` | Redis Sentinel settings |
+| redisSentinel.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/opstree/redis-sentinel","tag":"v8.4.0"}` | Image |
+| redisSentinel.podSecurityContext | object | `{"fsGroup":1000,"runAsUser":1000}` | Security |
+| redisSentinel.redisExporter | object | `{"enabled":true,"image":{"repository":"quay.io/opstree/redis-exporter","tag":"v1.80.1"},"serviceMonitor":{"enabled":true,"extraLabels":{},"interval":"30s","scrapeTimeout":"10s"}}` | Metrics |
+| redisSentinel.resources | object | `{"requests":{"cpu":"10m","memory":"32Mi"}}` | Resources |
 | replicationNameOverride | string | `""` | Override the name of the resources |
+| sentinelNameOverride | string | `""` |  |

 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
--- a/charts/redis-replication/templates/_helpers.tpl
+++ b/charts/redis-replication/templates/_helpers.tpl
@@ -9,6 +9,14 @@ Expand the names
  {{- end }}
 {{- end }}

+{{- define "redis.sentinelName" -}}
+  {{- if .Values.sentinelNameOverride }}
+    {{- .Values.sentinelNameOverride | trunc 63 | trimSuffix "-" }}
+  {{- else }}
+    {{- printf "redis-sentinel-%s" .Release.Name -}}
+  {{- end }}
+{{- end }}
+
 {{/*
 Allow the release namespace to be overridden for multi-namespace deployments in combined charts
 */}}
@@ -49,3 +57,9 @@ app.kubernetes.io/name: {{ include "redis.replicationName" $ }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{- define "redis.sentinelSelectorLabels" -}}
+app.kubernetes.io/name: {{ include "redis.sentinelName" $ }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}
--- a/charts/redis-replication/templates/redis-replication.yaml
+++ b/charts/redis-replication/templates/redis-replication.yaml
@@ -12,7 +12,7 @@ spec:
  podSecurityContext:
  {{- with .Values.redisReplication.podSecurityContext }}
    {{- toYaml . | nindent 4 }}
-  {{- end }}
+  {{ end }}

  kubernetesConfig:
    image: "{{ .Values.redisReplication.image.repository }}:{{ .Values.redisReplication.image.tag }}"
@@ -20,38 +20,20 @@ spec:
    resources:
    {{- with .Values.redisReplication.resources }}
      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- if .Values.existingSecret.enabled }}
-    redisSecret:
-      name: {{ .Values.existingSecret.name }}
-      key: {{ .Values.existingSecret.key }}
-    {{- end }}
-
-  storage:
-    volumeClaimTemplate:
-    {{- with .Values.redisReplication.volumeClaimTemplate }}
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-
-  redisExporter:
-    enabled: {{ .Values.redisReplication.redisExporter.enabled }}
-    image: "{{ .Values.redisReplication.redisExporter.image.repository }}:{{ .Values.redisReplication.redisExporter.image.tag }}"
-
-  {{- if .Values.redisReplication.sentinel.enabled }}
-  sentinel:
-    image: "{{ .Values.redisReplication.sentinel.image.repository }}:{{ .Values.redisReplication.sentinel.image.tag }}"
-    imagePullPolicy: {{ .Values.redisReplication.sentinel.image.pullPolicy }}
+    {{ end }}

    {{ if .Values.existingSecret.enabled }}
    redisSecret:
      name: {{ .Values.existingSecret.name }}
      key: {{ .Values.existingSecret.key }}
-    {{- end }}
+    {{ end }}

-    resources:
-    {{- with .Values.redisReplication.sentinel.resources }}
-      {{- toYaml . | nindent 10 }}
-    {{- end }}
+  storage:
+    volumeClaimTemplate:
+    {{- with .Values.redisReplication.volumeClaimTemplate }}
+      {{- toYaml . | nindent 6 }}
+    {{ end }}

-    size: {{ .Values.redisReplication.sentinel.size }}
-  {{- end }}
+  redisExporter:
+    enabled: {{ .Values.redisReplication.redisExporter.enabled }}
+    image: "{{ .Values.redisReplication.redisExporter.image.repository }}:{{ .Values.redisReplication.redisExporter.image.tag }}"
--- a/charts/redis-replication/templates/redis-sentinel.yaml
+++ b/charts/redis-replication/templates/redis-sentinel.yaml
@@ -0,0 +1,46 @@
+{{- if .Values.redisSentinel.enabled }}
+---
+apiVersion: redis.redis.opstreelabs.in/v1beta2
+kind: RedisSentinel
+metadata:
+  name: {{ include "redis.sentinelName" . }}
+  namespace: {{ include "redis.namespace" . }}
+  labels:
+    {{- include "redis.labels" . | nindent 4 }}
+    {{- include "redis.sentinelSelectorLabels" . | nindent 4 }}
+spec:
+  clusterSize: {{ .Values.redisSentinel.clusterSize }}
+
+  podSecurityContext:
+  {{- with .Values.redisSentinel.podSecurityContext }}
+    {{- toYaml . | nindent 10 }}
+  {{ end }}
+
+  redisSentinelConfig:
+    redisReplicationName: {{ include "redis.replicationName" . }}
+    {{ if .Values.existingSecret.enabled }}
+    redisReplicationPassword:
+      secretKeyRef:
+        name: {{ .Values.existingSecret.name }}
+        key: {{ .Values.existingSecret.key }}
+    {{ end }}
+
+  kubernetesConfig:
+    image: "{{ .Values.redisSentinel.image.repository }}:{{ .Values.redisSentinel.image.tag }}"
+    imagePullPolicy: {{ .Values.redisSentinel.image.pullPolicy }}
+    resources:
+    {{- with .Values.redisSentinel.resources }}
+      {{- toYaml . | nindent 10 }}
+    {{ end }}
+
+    {{ if .Values.existingSecret.enabled }}
+    redisSecret:
+      name: {{ .Values.existingSecret.name }}
+      key: {{ .Values.existingSecret.key }}
+    {{ end }}
+
+  redisExporter:
+    enabled: {{ .Values.redisSentinel.redisExporter.enabled }}
+    image: "{{ .Values.redisSentinel.redisExporter.image.repository }}:{{ .Values.redisSentinel.redisExporter.image.tag }}"
+
+{{- end }}
--- a/charts/redis-replication/templates/service-monitor.yaml
+++ b/charts/redis-replication/templates/service-monitor.yaml
@@ -22,3 +22,28 @@ spec:
      interval: {{ .Values.redisReplication.redisExporter.serviceMonitor.interval }}
      scrapeTimeout: {{ .Values.redisReplication.redisExporter.serviceMonitor.scrapeTimeout }}
 {{- end }}
+
+{{- if and (.Values.redisSentinel.redisExporter.serviceMonitor.enabled) (.Values.redisSentinel.enabled) }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "redis.sentinelName" . }}
+  namespace: {{ include "redis.namespace" . }}
+  labels:
+    {{- include "redis.labels" . | nindent 4 }}
+    {{- include "redis.sentinelSelectorLabels" . | nindent 4 }}
+    {{- with .Values.redisSentinel.redisExporter.serviceMonitor.extraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ include "redis.sentinelName" . }}
+      redis_setup_type: sentinel
+      role: sentinel
+  endpoints:
+    - port: sentinel-client
+      interval: {{ .Values.redisSentinel.redisExporter.serviceMonitor.interval }}
+      scrapeTimeout: {{ .Values.redisSentinel.redisExporter.serviceMonitor.scrapeTimeout }}
+{{- end }}
--- a/charts/redis-replication/values.yaml
+++ b/charts/redis-replication/values.yaml
@@ -1,5 +1,6 @@
 # -- Override the name of the resources
 replicationNameOverride: ""
+sentinelNameOverride: ""

 # -- Override the namespace of the chart
 namespaceOverride: ""
@@ -56,19 +57,36 @@ redisReplication:
      scrapeTimeout: 10s
      extraLabels: {}

-  # -- Redis Sentinel settings
-  sentinel:
-    enabled: false
-    size: 3
+# -- Redis Sentinel settings
+redisSentinel:
+  enabled: false
+  clusterSize: 3

-    # -- Image
+  # -- Security
+  podSecurityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+
+  # -- Image
+  image:
+    repository: quay.io/opstree/redis-sentinel
+    tag: v8.4.0
+    pullPolicy: IfNotPresent
+
+  # -- Resources
+  resources:
+    requests:
+      cpu: 10m
+      memory: 32Mi
+
+  # -- Metrics
+  redisExporter:
+    enabled: true
    image:
-      repository: quay.io/opstree/redis-sentinel
-      tag: v8.4.0
-      pullPolicy: IfNotPresent
-
-    # -- Resources
-    resources:
-      requests:
-        cpu: 10m
-        memory: 32Mi
+      repository: quay.io/opstree/redis-exporter
+      tag: v1.80.1
+    serviceMonitor:
+      enabled: true
+      interval: 30s
+      scrapeTimeout: 10s
+      extraLabels: {}
--- a/charts/volsync-target/Chart.yaml
+++ b/charts/volsync-target/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: volsync-target
-version: 0.7.0
+version: 0.6.0
 description: Volsync Replication set to target specific PVC with preconfigured settings
 keywords:
  - volsync-target
--- a/charts/volsync-target/README.md
+++ b/charts/volsync-target/README.md
@@ -1,6 +1,6 @@
 # volsync-target

-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)

 Volsync Replication set to target specific PVC with preconfigured settings

@@ -25,7 +25,7 @@ Volsync Replication set to target specific PVC with preconfigured settings
 | external.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
 | external.schedule | string | `"0 9 * * *"` | 5 character cron schedule |
 | externalSecrets | object | `{"enabled":true}` | Use external secrets |
-| local | object | `{"enabled":false,"externalSecret":{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-local"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 8 * * *"}` | Local backup configuration |
+| local | object | `{"enabled":true,"externalSecret":{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-local"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 8 * * *"}` | Local backup configuration |
 | local.externalSecret | object | `{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-local"}` | External Secret configuration |
 | local.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
 | local.schedule | string | `"0 8 * * *"` | 5 character cron schedule |
@@ -33,7 +33,7 @@ Volsync Replication set to target specific PVC with preconfigured settings
 | nameOverride | string | `""` | Default pattern follows <pvcTarget>-backup |
 | namespaceOverride | string | `""` | Override the namespace of the chart |
 | pvcTarget | string | `"data"` | Name of the PVC target |
-| remote | object | `{"enabled":false,"externalSecret":{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-remote"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 10 * * *"}` | Remote backup configuration |
+| remote | object | `{"enabled":true,"externalSecret":{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-remote"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 10 * * *"}` | Remote backup configuration |
 | remote.externalSecret | object | `{"credentialPath":"/garage/home-infra/volsync-backups","volsyncPath":"/volsync/restic/garage-remote"}` | External Secret configuration |
 | remote.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":3,"weekly":4,"yearly":1},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
 | remote.schedule | string | `"0 10 * * *"` | 5 character cron schedule |
--- a/charts/volsync-target/values.yaml
+++ b/charts/volsync-target/values.yaml
@@ -19,7 +19,7 @@ externalSecrets:

 # -- Local backup configuration
 local:
-  enabled: false
+  enabled: true

  # -- 5 character cron schedule
  schedule: 0 8 * * *
@@ -48,7 +48,7 @@ local:

 # -- Remote backup configuration
 remote:
-  enabled: false
+  enabled: true

  # -- 5 character cron schedule
  schedule: 0 10 * * *