fix: wrong destination secret generation

feat: add include and exclude to prune
feat: add age to backup
2026-04-26 14:13:08 -05:00 · 2026-04-26 14:12:11 -05:00 · 2026-04-26 13:57:24 -05:00 · 2026-04-25 20:56:43 -05:00
6 changed files with 21 additions and 7 deletions
--- a/charts/rclone-bucket/Chart.yaml
+++ b/charts/rclone-bucket/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: rclone-bucket
-version: 0.1.0
+version: 0.4.1
 description: Rclone CronJob to replicate buckets
 keywords:
  - rclone-bucket
--- a/charts/rclone-bucket/README.md
+++ b/charts/rclone-bucket/README.md
@@ -1,6 +1,6 @@
 # rclone-bucket

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

 Rclone CronJob to replicate buckets

@@ -29,7 +29,7 @@ Rclone CronJob to replicate buckets
 | 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.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96"}` | Default image |
 | nameOverride | string | `""` | Default pattern follows <pvcTarget>-backup |
-| prune | object | `{"ageToPrune":"90d","enabled":false}` | Enable prune job |
+| 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 |
--- a/charts/rclone-bucket/templates/_helpers.tpl
+++ b/charts/rclone-bucket/templates/_helpers.tpl
@@ -17,7 +17,7 @@ Generate the secret name
    {{- if .Values.secret.externalSecret.source.nameOverride }}
      {{- .Values.secret.externalSecret.source.nameOverride | trunc 63 | trimSuffix "-" }}
    {{- else }}
-      {{- printf "%s-rclone-config" .Values.rclone.source.bucketName -}}
+      {{- printf "%s-rclone-source-config" .Values.rclone.source.bucketName -}}
    {{- end }}
  {{- else if .Values.secret.existingSecretSource.name }}
    {{- printf "%s" .Values.secret.existingSecretSource.name -}}
@@ -31,7 +31,7 @@ Generate the secret name
    {{- if .Values.secret.externalSecret.destination.nameOverride }}
      {{- .Values.secret.externalSecret.destination.nameOverride | trunc 63 | trimSuffix "-" }}
    {{- else }}
-      {{- printf "%s-rclone-config" .Values.rclone.destination.bucketName -}}
+      {{- printf "%s-rclone-destination-config" .Values.rclone.destination.bucketName -}}
    {{- end }}
  {{- else if .Values.secret.existingSecretDestination.name }}
    {{- printf "%s" .Values.secret.existingSecretDestination.name -}}
--- a/charts/rclone-bucket/templates/common.yaml
+++ b/charts/rclone-bucket/templates/common.yaml
@@ -22,6 +22,18 @@ controllers:
          - src:{{ .Values.rclone.source.bucketName }}
          - dest:{{ .Values.rclone.destination.bucketName }}
          - --s3-no-check-bucket
+          {{- if .Values.prune.enabled }}
+          - --min-age
+          - {{ .Values.prune.ageToPrune }}
+          {{- end }}
+          {{- if .Values.prune.include }}
+          - --include
+          - {{ .Values.prune.include }}
+          {{- end }}
+          {{- if .Values.prune.exclude }}
+          - --exclude
+          - {{ .Values.prune.exclude }}
+          {{- end }}
          - --verbose
        env:
          - name: RCLONE_S3_PROVIDER
--- a/charts/rclone-bucket/templates/external-secret.yaml
+++ b/charts/rclone-bucket/templates/external-secret.yaml
@@ -57,11 +57,11 @@ spec:
    - secretKey: {{ include "secret.envSecretKey" . }}
      remoteRef:
        key: {{ .Values.secret.externalSecret.destination.credentials.path }}
-        property: {{ .Values.secret.externalSecret.destination.credentials.keyIdProperty }}
+        property: {{ .Values.secret.externalSecret.destination.credentials.secretKeyProperty }}
    - secretKey: {{ include "secret.envRegion" . }}
      remoteRef:
        key: {{ .Values.secret.externalSecret.destination.credentials.path }}
-        property: {{ .Values.secret.externalSecret.destination.credentials.keyIdProperty }}
+        property: {{ .Values.secret.externalSecret.destination.credentials.regionProperty }}
    - secretKey: {{ include "secret.envDestEndpoint" . }}
      remoteRef:
        key: {{ .Values.secret.externalSecret.destination.config.path }}
--- a/charts/rclone-bucket/values.yaml
+++ b/charts/rclone-bucket/values.yaml
@@ -38,6 +38,8 @@ rclone:
 prune:
  enabled: false
  ageToPrune: 90d
+  include: ""
+  exclude: ""

 # -- Secret configuration
 secret:
Author	SHA1	Message	Date
Alex Lebens	f901d1574b	fix: wrong destination secret generation All checks were successful lint-and-test / lint-helm (push) Successful in 15s Details lint-and-test / chart-testing (push) Successful in 29s Details renovate / renovate (push) Successful in 46s Details release-charts-rclone-bucket / release (push) Successful in 3m8s Details	2026-04-26 14:13:08 -05:00
Alex Lebens	73779ad42b	feat: add include and exclude to prune All checks were successful lint-and-test / lint-helm (push) Successful in 14s Details lint-and-test / chart-testing (push) Successful in 25s Details release-charts-rclone-bucket / release (push) Successful in 20s Details renovate / renovate (push) Successful in 57s Details	2026-04-26 14:12:11 -05:00
Alex Lebens	96cc6a8038	feat: add age to backup All checks were successful lint-and-test / lint-helm (push) Successful in 17s Details release-charts-rclone-bucket / release (push) Successful in 30s Details renovate / renovate (push) Successful in 50s Details lint-and-test / chart-testing (push) Successful in 5m45s Details	2026-04-26 13:57:24 -05:00
Alex Lebens	addd63616c	fix: separate secret naming All checks were successful lint-and-test / lint-helm (push) Successful in 22s Details renovate / renovate (push) Successful in 41s Details release-charts-rclone-bucket / release (push) Successful in 57s Details lint-and-test / chart-testing (push) Successful in 3m21s Details	2026-04-25 20:56:43 -05:00