feat: release 3.0.0

Reviewed-on: #195

.gitea/workflows/release-charts-rclone-bucket.yml

@@ -0,0 +1,128 @@
+name: release-charts-rclone-bucket
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "charts/rclone-bucket/**"
+
+  workflow_dispatch:
+
+env:
+  WORKFLOW_DIR: "charts/rclone-bucket"
+
+jobs:
+  release:
+    runs-on: ubuntu-js
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v5
+        with:
+          token: ${{ secrets.GITEA_TOKEN }}
+          version: v3.19.2
+
+      - name: Add Repositories
+        run: |
+          cd ${WORKFLOW_DIR}
+
+          echo ">> Adding repositories for chart dependencies ..."
+          helm dependency list --max-col-width 120 2> /dev/null \
+            | tail +2 | head -n -1 \
+            | awk '{ print "helm repo add " $1 " " $3 }' \
+            | while read cmd; do echo "$cmd" | sh; done || true
+
+          if helm repo list | tail +2 | read -r; then
+            echo ">> Update repository cache ..."
+            helm repo update
+          fi
+
+          echo "----"
+
+      - name: Package Helm Chart
+        run: |
+          cd ${WORKFLOW_DIR}
+
+          echo ">> Building helm dependency ..."
+          helm dependency build --skip-refresh --debug
+
+          echo "----"
+
+          echo "PACKAGE_PATH=$(helm package . | awk '{print $NF}')" >> $GITEA_ENV
+
+      - name: Publish Helm Chart to Harbor
+        run: |
+          echo ">> Logging into Harbor ..."
+          helm registry login ${{ vars.REGISTRY_HOST }} -u ${{ vars.REGISTRY_USER }} -p ${{ secrets.REGISTRY_SECRET }} --debug
+
+          echo ""
+          echo ">> Publishing chart to Harbor ..."
+          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/helm-charts --debug
+
+          echo "----"
+
+      - name: Publish Helm Chart to Gitea
+        run: |
+          echo ">> Installing Chart Museum plugin ..."
+          helm plugin install https://github.com/chartmuseum/helm-push --debug
+
+          echo ""
+          echo ">> Adding Gitea repository ..."
+          helm repo add --username ${{ gitea.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm --debug
+
+          echo ""
+          echo ">> Pushing chart to gitea"
+          helm cm-push ${{ env.PACKAGE_PATH }} helm-charts --debug
+
+      - name: Extract Chart Metadata
+        run: |
+          cd ${WORKFLOW_DIR}
+
+          echo ">> Adding Chart metadata to workflow ENV ..."
+          echo ""
+          echo ">> Chart Version: $(yq '.version' Chart.yaml)"
+          echo ">> Chart Name: $(yq '.name' Chart.yaml)"
+
+          echo "----"
+
+          echo "CHART_VERSION=$(yq '.version' Chart.yaml)" >> $GITEA_ENV
+          echo "CHART_NAME=$(yq '.name' Chart.yaml)" >> $GITEA_ENV
+
+      - name: Release Helm Chart
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
+          tag_name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
+          files: |-
+            ${{ env.PACKAGE_PATH }}
+
+      - name: ntfy Success
+        uses: niniyas/ntfy-action@master
+        if: success()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Success - ${{ env.CHART_NAME }}'
+          priority: 3
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,successfully,completed
+          details: 'Helm Chart ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }} has been released!'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+
+      - name: ntfy Failed
+        uses: niniyas/ntfy-action@master
+        if: failure()
+        with:
+          url: '${{ secrets.NTFY_URL }}'
+          topic: '${{ secrets.NTFY_TOPIC }}'
+          title: 'Release Failure - ${{ env.CHART_NAME }}'
+          priority: 4
+          headers: '{"Authorization": "Bearer ${{ secrets.NTFY_CRED }}"}'
+          tags: action,failed
+          details: 'Helm Chart ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }} has failed to be released.'
+          icon: 'https://cdn.jsdelivr.net/gh/selfhst/icons/png/gitea.png'
+          actions: '[{"action": "view", "label": "Open Gitea", "url": "https://gitea.alexlebens.dev/alexlebens/helm-charts/actions?workflow=release-charts-rclone-bucket.yml", "clear": true}]'
+          image: true

charts/cloudflared/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://bjw-s-labs.github.io/helm-charts/
-  version: 4.6.2
+  version: 5.0.0
-digest: sha256:35e8f4e5d15d878c246a04eb51de580291f31203fa10e9e4d2318f16026b2061
+digest: sha256:153788a98eab8a2e83bd456e1f6f3d53d1a3363bfe5bca07bd232d948e01a6b2
-generated: "2026-01-16T13:29:29.385123-06:00"
+generated: "2026-05-07T20:55:55.373128-05:00"

charts/cloudflared/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.6.0
+version: 3.0.0
 description: Cloudflared Tunnel
 keywords:
   - cloudflare
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 4.6.2
+    version: 5.0.0
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/cloudflare.png
 # renovate: datasource=docker depName=cloudflare/cloudflared
 appVersion: 2026.3.0

charts/cloudflared/README.md

@@ -1,6 +1,6 @@
 # cloudflared
 
-![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![AppVersion: 2026.3.0](https://img.shields.io/badge/AppVersion-2026.3.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: 2026.3.0](https://img.shields.io/badge/AppVersion-2026.3.0-informational?style=flat-square)
 
 Cloudflared Tunnel
 
@@ -20,14 +20,16 @@ Cloudflared Tunnel
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://bjw-s-labs.github.io/helm-charts/ | common | 4.6.2 |
+| https://bjw-s-labs.github.io/helm-charts/ | common | 5.0.0 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"cloudflare/cloudflared","tag":"2026.3.0@sha256:6b599ca3e974349ead3286d178da61d291961182ec3fe9c505e1dd02c8ac31b0"}` | Default image |
+| metrics | object | `{"enabled":true}` | Metrics |
 | name | string | `""` | Name override of release |
+| protocol | string | `"auto"` | Protocol - Available values are auto, http2, and quic. |
 | resources | object | `{"requests":{"cpu":"1m","memory":"20Mi"}}` | Default resources |
 | secret | object | `{"existingSecret":{"key":"cf-tunnel-token","name":"cloudflared-secret"},"externalSecret":{"additionalLabels":{},"enabled":true,"nameOverride":"","store":{"name":"openbao","path":"/cloudflare/tunnels","property":"token"}}}` | Secret configuration |
 | secret.existingSecret | object | `{"key":"cf-tunnel-token","name":"cloudflared-secret"}` | Name of existing secret that contains Cloudflare token |

charts/cloudflared/templates/common.yaml

@@ -7,7 +7,10 @@ global:
 controllers:
   main:
     type: deployment
+    replicas: 1
     strategy: Recreate
+    serviceAccount:
+      name: {{ include "cloudflared.name" . }}
     containers:
       main:
         image:
@@ -17,8 +20,11 @@ controllers:
         args:
           - tunnel
           - --protocol
-          - http2
+          - {{ .Values.protocol }}
           - --no-autoupdate
+          {{- if .Values.metrics.enabled }}
+          - --metrics 0.0.0.0:20241
+          {{- end }}
           - run
           - --token
           - $(CF_MANAGED_TUNNEL_TOKEN)
@@ -29,10 +35,30 @@ controllers:
                 name: {{ include "secret.name" . }}
                 key: {{ include "secret.key" . }}
         resources:
-        {{- with .Values.resources }}
+          {{- with .Values.resources }}
-        resources:
           {{- toYaml . | nindent 10 }}
-        {{ end }}
+          {{ end }}
+{{- if .Values.metrics.enabled }}
+service:
+  main:
+    controller: main
+    ports:
+      metrics:
+        port: 20241
+        targetPort: 20241
+serviceMonitor:
+  main:
+    selector:
+      matchLabels:
+        app.kubernetes.io/name: {{ include "cloudflared.name" . }}
+        app.kubernetes.io/instance: {{ include "cloudflared.name" . }}
+    serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+    endpoints:
+      - port: metrics
+        interval: 30s
+        scrapeTimeout: 10s
+        path: /metrics
+{{- end }}
 {{- end -}}
 {{- $_ := mergeOverwrite .Values (include "cloudflared.hardcodedValues" . | fromYaml) -}}
 

charts/cloudflared/values.yaml

@@ -1,6 +1,13 @@
 # -- Name override of release
 name: ""
 
+# -- Protocol - Available values are auto, http2, and quic.
+protocol: auto
+
+# -- Metrics
+metrics:
+  enabled: true
+
 # -- Secret configuration
 secret:
 

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.2
+  version: 5.0.0
-digest: sha256:35e8f4e5d15d878c246a04eb51de580291f31203fa10e9e4d2318f16026b2061
+digest: sha256:153788a98eab8a2e83bd456e1f6f3d53d1a3363bfe5bca07bd232d948e01a6b2
-generated: "2026-01-16T13:29:01.760344-06:00"
+generated: "2026-05-07T20:58:40.139936-05:00"

charts/generic-device-plugin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: generic-device-plugin
-version: 0.20.31
+version: 0.21.1
 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.2
+    version: 5.0.0
-appVersion: 0.20.17
+appVersion: 0.21.1

charts/generic-device-plugin/README.md

@@ -1,6 +1,6 @@
 # generic-device-plugin
 
-![Version: 0.20.31](https://img.shields.io/badge/Version-0.20.31-informational?style=flat-square) ![AppVersion: 0.20.17](https://img.shields.io/badge/AppVersion-0.20.17-informational?style=flat-square)
+![Version: 0.21.1](https://img.shields.io/badge/Version-0.21.1-informational?style=flat-square) ![AppVersion: 0.21.1](https://img.shields.io/badge/AppVersion-0.21.1-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.2 |
+| https://bjw-s-labs.github.io/helm-charts/ | common | 5.0.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:d9e098e33a20c32a561adb1ef8cace7d5912cd5ffb38f07dd9f83af4bdf38505"}` | Default image |
+| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:2e0c0b78043d5f0885b99c9ac3c1506844c9645081740d2394ce6e23b168bfe8"}` | 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 |

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:d9e098e33a20c32a561adb1ef8cace7d5912cd5ffb38f07dd9f83af4bdf38505
+  tag: latest@sha256:2e0c0b78043d5f0885b99c9ac3c1506844c9645081740d2394ce6e23b168bfe8
   pullPolicy: Always
 
 # -- Domain used by devices for identifcation

charts/rclone-bucket/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: https://bjw-s-labs.github.io/helm-charts/
+  version: 5.0.0
+digest: sha256:153788a98eab8a2e83bd456e1f6f3d53d1a3363bfe5bca07bd232d948e01a6b2
+generated: "2026-05-07T20:56:33.260732-05:00"

charts/rclone-bucket/Chart.yaml

@@ -0,0 +1,20 @@
+apiVersion: v2
+name: rclone-bucket
+version: 0.8.1
+description: Rclone CronJob to replicate buckets
+keywords:
+  - rclone-bucket
+  - rclone
+  - storage
+sources:
+  - https://github.com/rclone/rclone
+  - https://hub.docker.com/r/rclone/rclone
+maintainers:
+  - name: alexlebens
+dependencies:
+  - name: common
+    repository: https://bjw-s-labs.github.io/helm-charts/
+    version: 5.0.0
+icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/rclone.png
+# renovate: datasource=github-releases depName=rclone/rclone
+appVersion: v1.74.0

charts/rclone-bucket/README.md

@@ -0,0 +1,44 @@
+# rclone-bucket
+
+![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![AppVersion: v1.74.0](https://img.shields.io/badge/AppVersion-v1.74.0-informational?style=flat-square)
+
+Rclone CronJob to replicate buckets
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| alexlebens |  |  |
+
+## Source Code
+
+* <https://github.com/rclone/rclone>
+* <https://hub.docker.com/r/rclone/rclone>
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://bjw-s-labs.github.io/helm-charts/ | common | 5.0.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| additionalLabels | object | `{}` | Add additional labels |
+| cronJob | object | `{"backoffLimit":3,"parallelism":1,"schedule":"0 0 * * *","suspend":false,"timeZone":"America/Chicago"}` | CronJob configuration |
+| image | object | `{"pullPolicy":"IfNotPresent","repository":"rclone/rclone","tag":"1.74.0@sha256:d2e0e88359d0b2e67cfcd2c43d5405185eb8adfc207079df27c42da82c5207bc"}` | Default image |
+| nameOverride | string | `""` | Default pattern follows <pvcTarget>-backup |
+| prune | object | `{"ageToPrune":"90d","enabled":false,"exclude":"","include":""}` | Enable prune job |
+| rclone | object | `{"destination":{"bucketName":"bucket","forcePathStyle":true,"providerType":"Other"},"providerType":"Other","source":{"bucketName":"bucket","forcePathStyle":true,"providerType":"Other"}}` | rclone configuration |
+| rclone.destination | object | `{"bucketName":"bucket","forcePathStyle":true,"providerType":"Other"}` | Destination configuration |
+| rclone.source | object | `{"bucketName":"bucket","forcePathStyle":true,"providerType":"Other"}` | Source configuration |
+| secret | object | `{"existingSecretDestination":{"name":"rclone-destination-secret"},"existingSecretSource":{"name":"rclone-source-secret"},"externalSecret":{"additionalLabels":{},"destination":{"config":{"endpointProperty":"ENDPOINT_REMOTE","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""},"enabled":true,"source":{"config":{"endpointProperty":"ENDPOINT_LOCAL","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""},"storeName":"openbao"}}` | Secret configuration |
+| secret.existingSecretSource | object | `{"name":"rclone-source-secret"}` | Name of existing secret that contains the configuration |
+| secret.externalSecret | object | `{"additionalLabels":{},"destination":{"config":{"endpointProperty":"ENDPOINT_REMOTE","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""},"enabled":true,"source":{"config":{"endpointProperty":"ENDPOINT_LOCAL","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""},"storeName":"openbao"}` | External Secret configuration |
+| secret.externalSecret.additionalLabels | object | `{}` | Add additional labels |
+| secret.externalSecret.destination | object | `{"config":{"endpointProperty":"ENDPOINT_REMOTE","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""}` | Destination configuration |
+| secret.externalSecret.source | object | `{"config":{"endpointProperty":"ENDPOINT_LOCAL","path":"/config"},"credentials":{"keyIdProperty":"ACCESS_KEY_ID","path":"/credential","regionProperty":"ACCESS_REGION","secretKeyProperty":"ACCESS_SECRET_KEY"},"nameOverride":""}` | Source configuration |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/rclone-bucket/templates/_helpers.tpl

@@ -0,0 +1,90 @@
+{{/*
+Generate the root name
+*/}}
+{{- define "rclone.name" -}}
+  {{- if .Values.nameOverride }}
+    {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+  {{- else }}
+    {{- printf "%s-rclone" .Values.rclone.source.bucketName | trunc 63 | trimSuffix "-" -}}
+  {{- end }}
+{{- end }}
+
+{{/*
+Generate the secret name
+*/}}
+{{- define "rclone.sourceSecretName" -}}
+  {{- if .Values.secret.externalSecret.enabled }}
+    {{- if .Values.secret.externalSecret.source.nameOverride }}
+      {{- .Values.secret.externalSecret.source.nameOverride | trunc 63 | trimSuffix "-" }}
+    {{- else }}
+      {{- printf "%s-rclone-source-config" .Values.rclone.source.bucketName -}}
+    {{- end }}
+  {{- else if .Values.secret.existingSecretSource.name }}
+    {{- printf "%s" .Values.secret.existingSecretSource.name -}}
+  {{- else }}
+    {{ fail "No Secret Name Found!" }}
+  {{- end }}
+{{- end }}
+
+{{- define "rclone.destinationSecretName" -}}
+  {{- if .Values.secret.externalSecret.enabled }}
+    {{- if .Values.secret.externalSecret.destination.nameOverride }}
+      {{- .Values.secret.externalSecret.destination.nameOverride | trunc 63 | trimSuffix "-" }}
+    {{- else }}
+      {{- printf "%s-rclone-destination-config" .Values.rclone.destination.bucketName -}}
+    {{- end }}
+  {{- else if .Values.secret.existingSecretDestination.name }}
+    {{- printf "%s" .Values.secret.existingSecretDestination.name -}}
+  {{- else }}
+    {{ fail "No Secret Name Found!" }}
+  {{- end }}
+{{- end }}
+
+{{/*
+Common env names
+*/}}
+{{- define "secretRclone.envAccessKey" -}}
+ACCESS_KEY_ID
+{{- end }}
+{{- define "secretRclone.envSecretKey" -}}
+ACCESS_SECRET_KEY
+{{- end }}
+{{- define "secretRclone.envRegion" -}}
+ACCESS_REGION
+{{- end }}
+{{- define "secretRclone.envSrcEndpoint" -}}
+SRC_ENDPOINT
+{{- end }}
+{{- define "secretRclone.envDestEndpoint" -}}
+DEST_ENDPOINT
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "secretRclone.chart" -}}
+  {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "secretRclone.labels" -}}
+helm.sh/chart: {{ include "secretRclone.chart" $ }}
+{{ include "secretRclone.selectorLabels" $ }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.Version | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.secret.externalSecret.additionalLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "secretRclone.selectorLabels" -}}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ .Release.Name }}
+{{- end }}

charts/rclone-bucket/templates/common.yaml

@@ -0,0 +1,143 @@
+{{- include "bjw-s.common.loader.init" . }}
+
+{{- define "rclone.hardcodedValues" -}}
+global:
+  nameOverride: {{ include "rclone.name" . }}
+  fullNameOverride: {{ include "rclone.name" . }}
+controllers:
+  main:
+    type: cronjob
+    {{- with .Values.cronJob }}
+    cronjob:
+      {{- toYaml . | nindent 6 }}
+    {{ end }}
+    containers:
+      sync:
+        image:
+          repository: {{ .Values.image.repository }}
+          tag: {{ .Values.image.tag }}
+          pullPolicy: {{ .Values.image.pullPolicy }}
+        args:
+          - sync
+          - src:{{ .Values.rclone.source.bucketName }}
+          - dest:{{ .Values.rclone.destination.bucketName }}
+          - --s3-no-check-bucket
+          {{- if .Values.prune.enabled }}
+          - --max-age
+          - {{ .Values.prune.ageToPrune | quote }}
+          {{- end }}
+          {{- if .Values.prune.include }}
+          - --include
+          - {{ .Values.prune.include | quote }}
+          {{- end }}
+          {{- if .Values.prune.exclude }}
+          - --exclude
+          - {{ .Values.prune.exclude | quote }}
+          {{- end }}
+          - --verbose
+        env:
+          - name: RCLONE_S3_PROVIDER
+            value: {{ .Values.rclone.providerType }}
+          - name: RCLONE_CONFIG_SRC_TYPE
+            value: s3
+          - name: RCLONE_CONFIG_SRC_PROVIDER
+            value: {{ .Values.rclone.source.providerType }}
+          - name: RCLONE_CONFIG_SRC_ENV_AUTH
+            value: "false"
+          - name: RCLONE_CONFIG_SRC_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.sourceSecretName" . }}
+                key: {{ include "secretRclone.envAccessKey" . }}
+          - name: RCLONE_CONFIG_SRC_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.sourceSecretName" . }}
+                key: {{ include "secretRclone.envSecretKey" . }}
+          - name: RCLONE_CONFIG_SRC_REGION
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.sourceSecretName" . }}
+                key: {{ include "secretRclone.envRegion" . }}
+          - name: RCLONE_CONFIG_SRC_ENDPOINT
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.sourceSecretName" . }}
+                key: {{ include "secretRclone.envSrcEndpoint" . }}
+          - name: RCLONE_CONFIG_SRC_FORCE_PATH_STYLE
+            value: {{ .Values.rclone.source.forcePathStyle | quote }}
+          - name: RCLONE_CONFIG_DEST_TYPE
+            value: s3
+          - name: RCLONE_CONFIG_DEST_PROVIDER
+            value: {{ .Values.rclone.destination.providerType }}
+          - name: RCLONE_CONFIG_DEST_ENV_AUTH
+            value: "false"
+          - name: RCLONE_CONFIG_DEST_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envAccessKey" . }}
+          - name: RCLONE_CONFIG_DEST_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envSecretKey" . }}
+          - name: RCLONE_CONFIG_DEST_REGION
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envRegion" . }}
+          - name: RCLONE_CONFIG_DEST_ENDPOINT
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envDestEndpoint" . }}
+          - name: RCLONE_CONFIG_DEST_FORCE_PATH_STYLE
+            value: {{ .Values.rclone.destination.forcePathStyle | quote }}
+      {{- if .Values.prune.enabled }}
+      prune:
+        image:
+          repository: {{ .Values.image.repository }}
+          tag: {{ .Values.image.tag }}
+          pullPolicy: {{ .Values.image.pullPolicy }}
+        args:
+          - delete
+          - dest:{{ .Values.rclone.destination.bucketName }}
+          - --min-age
+          - {{ .Values.prune.ageToPrune | quote }}
+          - --verbose
+        env:
+          - name: RCLONE_CONFIG_DEST_TYPE
+            value: s3
+          - name: RCLONE_CONFIG_DEST_PROVIDER
+            value: {{ .Values.rclone.destination.providerType }}
+          - name: RCLONE_CONFIG_DEST_ENV_AUTH
+            value: "false"
+          - name: RCLONE_CONFIG_DEST_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envAccessKey" . }}
+          - name: RCLONE_CONFIG_DEST_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envSecretKey" . }}
+          - name: RCLONE_CONFIG_DEST_REGION
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envRegion" . }}
+          - name: RCLONE_CONFIG_DEST_ENDPOINT
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "rclone.destinationSecretName" . }}
+                key: {{ include "secretRclone.envDestEndpoint" . }}
+          - name: RCLONE_CONFIG_DEST_FORCE_PATH_STYLE
+            value: {{ .Values.rclone.destination.forcePathStyle | quote }}
+      {{- end }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "rclone.hardcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
+{{ include "bjw-s.common.loader.generate" . }}

charts/rclone-bucket/templates/external-secret.yaml

@@ -0,0 +1,69 @@
+{{- if .Values.secret.externalSecret.enabled }}
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: {{ include "rclone.sourceSecretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "secretRclone.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "rclone.sourceSecretName" . }}
+    {{- with .Values.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: {{ .Values.secret.externalSecret.storeName | required "External Secret store name is required" }}
+  data:
+    - secretKey: {{ include "secretRclone.envAccessKey" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.source.credentials.path }}
+        property: {{ .Values.secret.externalSecret.source.credentials.keyIdProperty }}
+    - secretKey: {{ include "secretRclone.envSecretKey" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.source.credentials.path }}
+        property: {{ .Values.secret.externalSecret.source.credentials.secretKeyProperty }}
+    - secretKey: {{ include "secretRclone.envRegion" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.source.credentials.path }}
+        property: {{ .Values.secret.externalSecret.source.credentials.regionProperty }}
+    - secretKey: {{ include "secretRclone.envSrcEndpoint" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.source.config.path }}
+        property: {{ .Values.secret.externalSecret.source.config.endpointProperty }}
+
+---
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: {{ include "rclone.destinationSecretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "secretRclone.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "rclone.destinationSecretName" . }}
+    {{- with .Values.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: {{ .Values.secret.externalSecret.storeName | required "External Secret store name is required" }}
+  data:
+    - secretKey: {{ include "secretRclone.envAccessKey" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.destination.credentials.path }}
+        property: {{ .Values.secret.externalSecret.destination.credentials.keyIdProperty }}
+    - secretKey: {{ include "secretRclone.envSecretKey" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.destination.credentials.path }}
+        property: {{ .Values.secret.externalSecret.destination.credentials.secretKeyProperty }}
+    - secretKey: {{ include "secretRclone.envRegion" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.destination.credentials.path }}
+        property: {{ .Values.secret.externalSecret.destination.credentials.regionProperty }}
+    - secretKey: {{ include "secretRclone.envDestEndpoint" . }}
+      remoteRef:
+        key: {{ .Values.secret.externalSecret.destination.config.path }}
+        property: {{ .Values.secret.externalSecret.destination.config.endpointProperty }}
+{{- end }}

charts/rclone-bucket/values.yaml

@@ -0,0 +1,84 @@
+# -- Default pattern follows <pvcTarget>-backup
+nameOverride: ""
+
+# -- Add additional labels
+additionalLabels: {}
+
+# -- Default image
+image:
+  repository: rclone/rclone
+  tag: 1.74.0@sha256:d2e0e88359d0b2e67cfcd2c43d5405185eb8adfc207079df27c42da82c5207bc
+  pullPolicy: IfNotPresent
+
+# -- CronJob configuration
+cronJob:
+  suspend: false
+  timeZone: America/Chicago
+  schedule: 0 0 * * *
+  backoffLimit: 3
+  parallelism: 1
+
+# -- rclone configuration
+rclone:
+  providerType: Other
+
+  # -- Source configuration
+  source:
+    providerType: Other
+    bucketName: bucket
+    forcePathStyle: true
+
+  # -- Destination configuration
+  destination:
+    providerType: Other
+    bucketName: bucket
+    forcePathStyle: true
+
+# -- Enable prune job
+prune:
+  enabled: false
+  ageToPrune: 90d
+  include: ""
+  exclude: ""
+
+# -- Secret configuration
+secret:
+
+  # -- External Secret configuration
+  externalSecret:
+    enabled: true
+    storeName: openbao
+
+    # -- Source configuration
+    source:
+      nameOverride: ""
+      credentials:
+        path: /credential
+        keyIdProperty: ACCESS_KEY_ID
+        secretKeyProperty: ACCESS_SECRET_KEY
+        regionProperty: ACCESS_REGION
+      config:
+        path: /config
+        endpointProperty: ENDPOINT_LOCAL
+
+    # -- Destination configuration
+    destination:
+      nameOverride: ""
+      credentials:
+        path: /credential
+        keyIdProperty: ACCESS_KEY_ID
+        secretKeyProperty: ACCESS_SECRET_KEY
+        regionProperty: ACCESS_REGION
+      config:
+        path: /config
+        endpointProperty: ENDPOINT_REMOTE
+
+    # -- Add additional labels
+    additionalLabels: {}
+
+  # -- Name of existing secret that contains the configuration
+  existingSecretSource:
+    name: rclone-source-secret
+
+  existingSecretDestination:
+    name: rclone-destination-secret

charts/valkey/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: valkey
-version: 0.6.1
+version: 0.8.0
 description: Valkey chart with preconfigured settings
 keywords:
   - valkey
@@ -19,4 +19,4 @@ dependencies:
     version: 0.9.4
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons@main/png/valkey.png
 # renovate: datasource=github-releases depName=valkey-io/valkey
-appVersion: 9.0.3
+appVersion: 9.0.4

charts/valkey/README.md

@@ -1,6 +1,6 @@
 # valkey
 
-![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![AppVersion: 9.0.3](https://img.shields.io/badge/AppVersion-9.0.3-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![AppVersion: 9.0.4](https://img.shields.io/badge/AppVersion-9.0.4-informational?style=flat-square)
 
 Valkey chart with preconfigured settings
 
@@ -35,11 +35,11 @@ Valkey chart with preconfigured settings
 | valkey.dataStorage.requestedSize | string | `"1Gi"` |  |
 | valkey.image.registry | string | `"docker.io"` |  |
 | valkey.image.repository | string | `"valkey/valkey"` |  |
-| valkey.image.tag | string | `"9.0.3@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9"` |  |
+| valkey.image.tag | string | `"9.0.4@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193"` |  |
 | valkey.metrics.enabled | bool | `true` |  |
 | valkey.metrics.exporter.image.registry | string | `"ghcr.io"` |  |
 | valkey.metrics.exporter.image.repository | string | `"oliver006/redis_exporter"` |  |
-| valkey.metrics.exporter.image.tag | string | `"v1.82.0@sha256:6a97d4dd743b533e1f950c677b87d880e44df363c61af3f406fc9e53ed65ee03"` |  |
+| valkey.metrics.exporter.image.tag | string | `"v1.83.0@sha256:e8c209894d4c0cc55b1259ddd47e0b769ad1ff864b356736ee885462a3b0e48c"` |  |
 | valkey.metrics.exporter.resources.requests.cpu | string | `"1m"` |  |
 | valkey.metrics.exporter.resources.requests.memory | string | `"10M"` |  |
 | valkey.metrics.podMonitor.enabled | bool | `true` |  |

charts/valkey/values.yaml

@@ -3,7 +3,7 @@ valkey:
   image:
     registry: docker.io
     repository: valkey/valkey
-    tag: 9.0.3@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
+    tag: 9.0.4@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
   serviceAccount:
     create: true
   resources:
@@ -31,7 +31,7 @@ valkey:
       image:
         registry: ghcr.io
         repository: oliver006/redis_exporter
-        tag: v1.82.0@sha256:6a97d4dd743b533e1f950c677b87d880e44df363c61af3f406fc9e53ed65ee03
+        tag: v1.83.0@sha256:e8c209894d4c0cc55b1259ddd47e0b769ad1ff864b356736ee885462a3b0e48c
       resources:
         requests:
           cpu: 1m

charts/volsync-target/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: volsync-target
-version: 1.0.0
+version: 2.0.0
 description: Volsync Replication set to target specific PVC with preconfigured settings
 keywords:
   - volsync-target

charts/volsync-target/README.md

@@ -1,6 +1,6 @@
 # volsync-target
 
-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 0.15.0](https://img.shields.io/badge/AppVersion-0.15.0-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: 0.15.0](https://img.shields.io/badge/AppVersion-0.15.0-informational?style=flat-square)
 
 Volsync Replication set to target specific PVC with preconfigured settings
 
@@ -20,24 +20,25 @@ Volsync Replication set to target specific PVC with preconfigured settings
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | additionalLabels | object | `{}` | Add additional labels |
-| external | object | `{"enabled":true,"externalSecret":{"bucketPath":"/digital-ocean/config","credentialPath":"/digital-ocean/home-infra/volsync-backups"},"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 9 * * *"}` | External backup configuration |
+| external | object | `{"enabled":true,"externalSecret":{"bucketPath":"/backblaze/config","credentialPath":"/backblaze/home-infra/volsync-backups"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":35,"repository":"","retain":{"daily":0,"hourly":0,"monthly":0,"weekly":12,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 9 * * 0"}` | External backup configuration |
-| external.externalSecret | object | `{"bucketPath":"/digital-ocean/config","credentialPath":"/digital-ocean/home-infra/volsync-backups"}` | External Secret configuration |
+| external.externalSecret | object | `{"bucketPath":"/backblaze/config","credentialPath":"/backblaze/home-infra/volsync-backups"}` | External Secret configuration |
-| 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.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":35,"repository":"","retain":{"daily":0,"hourly":0,"monthly":0,"weekly":12,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
-| external.schedule | string | `"0 9 * * *"` | 5 character cron schedule |
+| external.schedule | string | `"0 9 * * 0"` | 5 character cron schedule |
 | externalSecrets | object | `{"enabled":true}` | Use external secrets |
 | kubernetesClusterName | string | `"cl01tl"` | Kubernetes cluster name |
-| local | object | `{"enabled":false,"externalSecret":{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"},"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":false,"externalSecret":{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":0,"weekly":4,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 8 * * *"}` | Local backup configuration |
 | local.externalSecret | object | `{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"}` | 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.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":7,"hourly":0,"monthly":0,"weekly":4,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
 | local.schedule | string | `"0 8 * * *"` | 5 character cron schedule |
 | moverSecurityContext | object | `{}` | Glocal security context for restic mover |
 | nameOverride | string | `""` | Default pattern follows <pvcTarget>-backup |
 | namespaceOverride | string | `""` | Override the namespace of the chart |
+| prometheusRule | object | `{"enabled":true}` | Prometheus Rule |
 | pvcTarget | string | `"data"` | Name of the PVC target |
-| remote | object | `{"enabled":false,"externalSecret":{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"},"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":false,"externalSecret":{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"},"restic":{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":0,"hourly":0,"monthly":0,"weekly":12,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"},"schedule":"0 10 * * 0"}` | Remote backup configuration |
 | remote.externalSecret | object | `{"bucketPath":"/garage/config","credentialPath":"/garage/home-infra/volsync-backups"}` | 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.restic | object | `{"cacheCapacity":"1Gi","copyMethod":"Snapshot","pruneIntervalDays":7,"repository":"","retain":{"daily":0,"hourly":0,"monthly":0,"weekly":12,"yearly":0},"storageClassName":"ceph-block","volumeSnapshotClassName":"ceph-blockpool-snapshot"}` | Backup configuration, inserted directly into the yaml |
-| remote.schedule | string | `"0 10 * * *"` | 5 character cron schedule |
+| remote.schedule | string | `"0 10 * * 0"` | 5 character cron schedule |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/volsync-target/templates/prometheus-rule.yaml

@@ -0,0 +1,32 @@
+{{- if .Values.prometheusRule.enabled }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "volsync.name" . }}-source-local
+  namespace: {{ include "volsync.namespace" . }}
+  labels:
+    {{- include "volsync.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "volsync.name" . }}-source-local
+    {{- with .Values.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: volsync.alerts
+      rules:
+        - alert: VolSyncBackupPodFailed
+          expr: |
+            (kube_pod_container_status_last_terminated_exitcode > 0)
+            * on(pod, namespace) group_left(owner_name)
+            kube_pod_owner{owner_kind="Job", owner_name=~"volsync-.*"}
+          for: 1m
+          labels:
+            severity: critical
+          annotations:
+            summary: "VolSync Backup Pod failed in {{ `{{ $labels.namespace }}` }}"
+            description: |
+              A pod for the VolSync backup of PVC '{{ .Values.pvcTarget }}' failed with exit code {{ `{{ $value }}` }}.
+              Job: {{ `{{ $labels.owner_name }}` }}
+              Namespace: {{ `{{ $labels.namespace }}` }}
+{{- end }}

charts/volsync-target/templates/replication-source.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: {{ include "volsync.namespace" . }}
   labels:
     {{- include "volsync.labels" . | nindent 4 }}
-    app.kubernetes.io/name: {{ include "volsync.name" . }}
+    app.kubernetes.io/name: {{ include "volsync.name" . }}-source-local
     {{- with .Values.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

charts/volsync-target/values.yaml

@@ -16,6 +16,10 @@ pvcTarget: "data"
 # -- Glocal security context for restic mover
 moverSecurityContext: {}
 
+# -- Prometheus Rule
+prometheusRule:
+  enabled: true
+
 # -- Use external secrets
 externalSecrets:
   enabled: true
@@ -35,8 +39,8 @@ local:
       hourly: 0
       daily: 7
       weekly: 4
-      monthly: 3
+      monthly: 0
-      yearly: 1
+      yearly: 0
     copyMethod: Snapshot
     storageClassName: ceph-block
     volumeSnapshotClassName: ceph-blockpool-snapshot
@@ -54,7 +58,7 @@ remote:
   enabled: false
 
   # -- 5 character cron schedule
-  schedule: 0 10 * * *
+  schedule: 0 10 * * 0
 
   # -- Backup configuration, inserted directly into the yaml
   restic:
@@ -62,10 +66,10 @@ remote:
     repository: ""
     retain:
       hourly: 0
-      daily: 7
+      daily: 0
-      weekly: 4
+      weekly: 12
-      monthly: 3
+      monthly: 0
-      yearly: 1
+      yearly: 0
     copyMethod: Snapshot
     storageClassName: ceph-block
     volumeSnapshotClassName: ceph-blockpool-snapshot
@@ -83,18 +87,18 @@ external:
   enabled: true
 
   # -- 5 character cron schedule
-  schedule: 0 9 * * *
+  schedule: 0 9 * * 0
 
   # -- Backup configuration, inserted directly into the yaml
   restic:
-    pruneIntervalDays: 7
+    pruneIntervalDays: 35
     repository: ""
     retain:
       hourly: 0
-      daily: 7
+      daily: 0
-      weekly: 4
+      weekly: 12
-      monthly: 3
+      monthly: 0
-      yearly: 1
+      yearly: 0
     copyMethod: Snapshot
     storageClassName: ceph-block
     volumeSnapshotClassName: ceph-blockpool-snapshot
@@ -103,6 +107,6 @@ external:
   # -- External Secret configuration
   externalSecret:
     # This path must contain the ENDPOINT
-    bucketPath: /digital-ocean/config
+    bucketPath: /backblaze/config
     # This path must contain the AWS/S3 credentials and RESTIC_PASSWORD
-    credentialPath: /digital-ocean/home-infra/volsync-backups
+    credentialPath: /backblaze/home-infra/volsync-backups