feat: change metric ports

charts/cloudflared/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 3.2.0
+version: 3.2.2
 description: Cloudflared Tunnel
 keywords:
   - cloudflare

charts/cloudflared/README.md

@@ -1,6 +1,6 @@
 # cloudflared
 
-![Version: 3.2.0](https://img.shields.io/badge/Version-3.2.0-informational?style=flat-square) ![AppVersion: 2026.3.0](https://img.shields.io/badge/AppVersion-2026.3.0-informational?style=flat-square)
+![Version: 3.2.2](https://img.shields.io/badge/Version-3.2.2-informational?style=flat-square) ![AppVersion: 2026.3.0](https://img.shields.io/badge/AppVersion-2026.3.0-informational?style=flat-square)
 
 Cloudflared Tunnel
 

charts/cloudflared/templates/common.yaml

@@ -24,7 +24,8 @@ controllers:
           - {{ .Values.protocol }}
           - --no-autoupdate
           {{- if .Values.metrics.enabled }}
-          - --metrics 0.0.0.0:20241
+          - --metrics
+          - 0.0.0.0:20241
           {{- end }}
           - run
           - --token
@@ -52,7 +53,7 @@ serviceMonitor:
     selector:
       matchLabels:
         app.kubernetes.io/name: {{ include "cloudflared.name" . }}
-        app.kubernetes.io/instance: {{ include "cloudflared.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Namespace }}
     serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
     endpoints:
       - port: metrics

charts/generic-device-plugin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: generic-device-plugin
-version: 0.21.1
+version: 0.21.2
 description: Generic Device Plugin
 keywords:
   - generic-device-plugin

charts/generic-device-plugin/README.md

@@ -1,6 +1,6 @@
 # generic-device-plugin
 
-![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)
+![Version: 0.21.2](https://img.shields.io/badge/Version-0.21.2-informational?style=flat-square) ![AppVersion: 0.21.1](https://img.shields.io/badge/AppVersion-0.21.1-informational?style=flat-square)
 
 Generic Device Plugin
 
@@ -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:2e0c0b78043d5f0885b99c9ac3c1506844c9645081740d2394ce6e23b168bfe8"}` | Default image |
+| image | object | `{"pullPolicy":"Always","repository":"ghcr.io/squat/generic-device-plugin","tag":"latest@sha256:7bc1ecec8472be1e5cf1ce534f0438a1d48cc3e2b4997cee924dac4d3dbfc3d3"}` | 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:2e0c0b78043d5f0885b99c9ac3c1506844c9645081740d2394ce6e23b168bfe8
+  tag: latest@sha256:7bc1ecec8472be1e5cf1ce534f0438a1d48cc3e2b4997cee924dac4d3dbfc3d3
   pullPolicy: Always
 
 # -- Domain used by devices for identifcation

charts/rclone-bucket/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: rclone-bucket
-version: 0.8.1
+version: 0.10.0
 description: Rclone CronJob to replicate buckets
 keywords:
   - rclone-bucket

charts/rclone-bucket/README.md

@@ -1,6 +1,6 @@
 # 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)
+![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-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
 
@@ -28,6 +28,7 @@ Rclone CronJob to replicate buckets
 | 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 |
+| metrics | object | `{"enabled":true}` | Metrics |
 | 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 |

charts/rclone-bucket/templates/common.yaml

@@ -4,6 +4,7 @@
 global:
   nameOverride: {{ include "rclone.name" . }}
   fullNameOverride: {{ include "rclone.name" . }}
+  createDefaultServiceAccount: true
 controllers:
   main:
     type: cronjob
@@ -11,6 +12,8 @@ controllers:
     cronjob:
       {{- toYaml . | nindent 6 }}
     {{ end }}
+    serviceAccount:
+      identifier: {{ .Release.Name }}
     containers:
       sync:
         image:
@@ -34,6 +37,11 @@ controllers:
           - --exclude
           - {{ .Values.prune.exclude | quote }}
           {{- end }}
+          {{- if .Values.metrics.enabled }}
+          - --rc
+          - --rc-enable-metrics
+          - --metrics-addr=0.0.0.0:5573
+          {{- end }}
           - --verbose
         env:
           - name: RCLONE_S3_PROVIDER
@@ -106,6 +114,11 @@ controllers:
           - --min-age
           - {{ .Values.prune.ageToPrune | quote }}
           - --verbose
+          {{- if .Values.metrics.enabled }}
+          - --rc
+          - --rc-enable-metrics
+          - --metrics-addr=0.0.0.0:5574
+          {{- end }}
         env:
           - name: RCLONE_CONFIG_DEST_TYPE
             value: s3
@@ -136,6 +149,37 @@ controllers:
           - name: RCLONE_CONFIG_DEST_FORCE_PATH_STYLE
             value: {{ .Values.rclone.destination.forcePathStyle | quote }}
       {{- end }}
+{{- if .Values.metrics.enabled }}
+service:
+  main:
+    controller: main
+    ports:
+      rc:
+        port: 5572
+        targetPort: 5572
+      metrics-sync:
+        port: 5573
+        targetPort: 5573
+      metrics-prune:
+        port: 5574
+        targetPort: 5574
+serviceMonitor:
+  main:
+    selector:
+      matchLabels:
+        app.kubernetes.io/name: {{ include "rclone.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Namespace }}
+    serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}'
+    endpoints:
+      - port: metrics-sync
+        interval: 10s
+        scrapeTimeout: 5s
+        path: /metrics
+      - port: metrics-prune
+        interval: 10s
+        scrapeTimeout: 5s
+        path: /metrics
+{{- end }}
 {{- end -}}
 {{- $_ := mergeOverwrite .Values (include "rclone.hardcodedValues" . | fromYaml) -}}
 

charts/rclone-bucket/values.yaml

@@ -82,3 +82,7 @@ secret:
 
   existingSecretDestination:
     name: rclone-destination-secret
+
+# -- Metrics
+metrics:
+  enabled: true