diff --git a/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-external-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-external-rclone.yaml index c4b2bb18a..8119a888a 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-external-rclone.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-external-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-postgres-backups-external-0.8.1 + helm.sh/chart: rclone-postgres-backups-external-0.9.0 namespace: cloudnative-pg spec: suspend: false @@ -30,7 +30,7 @@ spec: app.kubernetes.io/name: postgres-backups-external-rclone spec: enableServiceLinks: false - serviceAccountName: cloudnative-pg + serviceAccountName: cloudnative-pg-postgres-backups-external-rclone automountServiceAccountToken: false hostIPC: false hostNetwork: false @@ -44,6 +44,9 @@ spec: - --min-age - 45d - --verbose + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 env: - name: RCLONE_CONFIG_DEST_TYPE value: s3 @@ -87,6 +90,9 @@ spec: - /cl01tl/*/*/*/base/** - --exclude - '**/walls/**' + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-remote-rclone.yaml index c2b9be7bc..5dc2a4c4d 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/CronJob-cloudnative-pg-postgres-backups-remote-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-postgres-backups-remote-0.8.1 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 namespace: cloudnative-pg spec: suspend: false @@ -30,7 +30,7 @@ spec: app.kubernetes.io/name: postgres-backups-remote-rclone spec: enableServiceLinks: false - serviceAccountName: cloudnative-pg + serviceAccountName: cloudnative-pg-postgres-backups-remote-rclone automountServiceAccountToken: false hostIPC: false hostNetwork: false @@ -44,6 +44,9 @@ spec: - --min-age - 45d - --verbose + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 env: - name: RCLONE_CONFIG_DEST_TYPE value: s3 @@ -87,6 +90,9 @@ spec: - /cl01tl/*/*/*/base/** - --exclude - '**/walls/**' + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-775957147abfbc73-rclone-destination-config.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-775957147abfbc73-rclone-destination-config.yaml index 27178c8b5..51fa85796 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-775957147abfbc73-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-775957147abfbc73-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: postgres-backups-775957147abfbc73-rclone-destination-config namespace: cloudnative-pg labels: - helm.sh/chart: rclone-postgres-backups-external-0.8.1 + helm.sh/chart: rclone-postgres-backups-external-0.9.0 app.kubernetes.io/instance: cloudnative-pg app.kubernetes.io/part-of: cloudnative-pg - app.kubernetes.io/version: "0.8.1" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-775957147abfbc73-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-destination-config.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-destination-config.yaml index 4d51e684f..8976a6f48 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: postgres-backups-rclone-destination-config namespace: cloudnative-pg labels: - helm.sh/chart: rclone-postgres-backups-remote-0.8.1 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 app.kubernetes.io/instance: cloudnative-pg app.kubernetes.io/part-of: cloudnative-pg - app.kubernetes.io/version: "0.8.1" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-source-config.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-source-config.yaml index e1d3731ea..e15469426 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/ExternalSecret-postgres-backups-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: postgres-backups-rclone-source-config namespace: cloudnative-pg labels: - helm.sh/chart: rclone-postgres-backups-remote-0.8.1 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 app.kubernetes.io/instance: cloudnative-pg app.kubernetes.io/part-of: cloudnative-pg - app.kubernetes.io/version: "0.8.1" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-external-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-external-rclone.yaml new file mode 100644 index 000000000..d62cd19f9 --- /dev/null +++ b/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-external-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: cloudnative-pg-postgres-backups-external-rclone + labels: + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postgres-backups-external-rclone + app.kubernetes.io/service: cloudnative-pg-postgres-backups-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-postgres-backups-external-0.9.0 + namespace: cloudnative-pg +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/name: postgres-backups-external-rclone diff --git a/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-remote-rclone.yaml new file mode 100644 index 000000000..4a08198c3 --- /dev/null +++ b/clusters/cl01tl/manifests/cloudnative-pg/Service-cloudnative-pg-postgres-backups-remote-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: cloudnative-pg-postgres-backups-remote-rclone + labels: + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postgres-backups-remote-rclone + app.kubernetes.io/service: cloudnative-pg-postgres-backups-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 + namespace: cloudnative-pg +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/name: postgres-backups-remote-rclone diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-external-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-external-rclone.yaml index 08769fcb0..596988fbd 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-external-rclone.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-external-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-postgres-backups-external-0.8.1 + helm.sh/chart: rclone-postgres-backups-external-0.9.0 namespace: cloudnative-pg diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-remote-rclone.yaml index 264a07850..da9b1b275 100644 --- a/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/cloudnative-pg/ServiceAccount-cloudnative-pg-postgres-backups-remote-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: postgres-backups-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-postgres-backups-remote-0.8.1 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 namespace: cloudnative-pg diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-external-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-external-rclone.yaml new file mode 100644 index 000000000..143cbdcd2 --- /dev/null +++ b/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-external-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: cloudnative-pg-postgres-backups-external-rclone + labels: + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postgres-backups-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-postgres-backups-external-0.9.0 + namespace: cloudnative-pg +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - cloudnative-pg + selector: + matchLabels: + app.kubernetes.io/instance: postgres-backups-external-rclone + app.kubernetes.io/name: postgres-backups-external-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-remote-rclone.yaml new file mode 100644 index 000000000..0098107ba --- /dev/null +++ b/clusters/cl01tl/manifests/cloudnative-pg/ServiceMonitor-cloudnative-pg-postgres-backups-remote-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: cloudnative-pg-postgres-backups-remote-rclone + labels: + app.kubernetes.io/instance: cloudnative-pg + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postgres-backups-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-postgres-backups-remote-0.9.0 + namespace: cloudnative-pg +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - cloudnative-pg + selector: + matchLabels: + app.kubernetes.io/instance: postgres-backups-remote-rclone + app.kubernetes.io/name: postgres-backups-remote-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-external-rclone.yaml b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-external-rclone.yaml index be6ff7fa1..00656176a 100644 --- a/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-external-rclone.yaml +++ b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-external-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-directus-assets-external-0.7.0 + helm.sh/chart: rclone-directus-assets-external-0.9.0 namespace: directus spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: directus-assets-external-rclone spec: enableServiceLinks: false - serviceAccountName: directus - automountServiceAccountToken: true + serviceAccountName: directus-directus-assets-external-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -43,6 +43,9 @@ spec: - src:directus-assets - dest:directus-assets-37363a16b71dc59b - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-remote-rclone.yaml index 2750cddd0..c3d5360a4 100644 --- a/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-remote-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-directus-assets-remote-0.7.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 namespace: directus spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: directus-assets-remote-rclone spec: enableServiceLinks: false - serviceAccountName: directus - automountServiceAccountToken: true + serviceAccountName: directus-directus-assets-remote-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -43,6 +43,9 @@ spec: - src:directus-assets - dest:directus-assets - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-37363a16b71dc59b-rclone-destination-config.yaml b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-37363a16b71dc59b-rclone-destination-config.yaml index 42df14c31..e68f67124 100644 --- a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-37363a16b71dc59b-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-37363a16b71dc59b-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: directus-assets-37363a16b71dc59b-rclone-destination-config namespace: directus labels: - helm.sh/chart: rclone-directus-assets-external-0.7.0 + helm.sh/chart: rclone-directus-assets-external-0.9.0 app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-37363a16b71dc59b-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml index f4c7e5805..7cc01be39 100644 --- a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: directus-assets-rclone-destination-config namespace: directus labels: - helm.sh/chart: rclone-directus-assets-remote-0.7.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml index 745d9e0ce..9330a8d38 100644 --- a/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: directus-assets-rclone-source-config namespace: directus labels: - helm.sh/chart: rclone-directus-assets-remote-0.7.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 app.kubernetes.io/instance: directus app.kubernetes.io/part-of: directus - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-external-rclone.yaml b/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-external-rclone.yaml new file mode 100644 index 000000000..de14aaf1b --- /dev/null +++ b/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-external-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: directus-directus-assets-external-rclone + labels: + app.kubernetes.io/instance: directus + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-external-rclone + app.kubernetes.io/service: directus-directus-assets-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-directus-assets-external-0.9.0 + namespace: directus +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: directus + app.kubernetes.io/name: directus-assets-external-rclone diff --git a/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-remote-rclone.yaml new file mode 100644 index 000000000..ff1388b71 --- /dev/null +++ b/clusters/cl01tl/manifests/directus/Service-directus-directus-assets-remote-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: directus-directus-assets-remote-rclone + labels: + app.kubernetes.io/instance: directus + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-remote-rclone + app.kubernetes.io/service: directus-directus-assets-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 + namespace: directus +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: directus + app.kubernetes.io/name: directus-assets-remote-rclone diff --git a/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-external-rclone.yaml b/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-external-rclone.yaml index 65522fb7a..f605758fc 100644 --- a/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-external-rclone.yaml +++ b/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-external-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-directus-assets-external-0.7.0 + helm.sh/chart: rclone-directus-assets-external-0.9.0 namespace: directus diff --git a/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-remote-rclone.yaml index 2fa10a8cd..1504b16e4 100644 --- a/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/directus/ServiceAccount-directus-directus-assets-remote-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: directus-assets-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-directus-assets-remote-0.7.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 namespace: directus diff --git a/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-external-rclone.yaml b/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-external-rclone.yaml new file mode 100644 index 000000000..cdd98c34a --- /dev/null +++ b/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-external-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: directus-directus-assets-external-rclone + labels: + app.kubernetes.io/instance: directus + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-directus-assets-external-0.9.0 + namespace: directus +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - directus + selector: + matchLabels: + app.kubernetes.io/instance: directus-assets-external-rclone + app.kubernetes.io/name: directus-assets-external-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-remote-rclone.yaml new file mode 100644 index 000000000..57f8e7ad4 --- /dev/null +++ b/clusters/cl01tl/manifests/directus/ServiceMonitor-directus-directus-assets-remote-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: directus-directus-assets-remote-rclone + labels: + app.kubernetes.io/instance: directus + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-directus-assets-remote-0.9.0 + namespace: directus +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - directus + selector: + matchLabels: + app.kubernetes.io/instance: directus-assets-remote-rclone + app.kubernetes.io/name: directus-assets-remote-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-external-rclone.yaml b/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-external-rclone.yaml index 2b1e112a7..f13699f01 100644 --- a/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-external-rclone.yaml +++ b/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-external-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-karakeep-assets-external-0.7.0 + helm.sh/chart: rclone-karakeep-assets-external-0.9.0 namespace: karakeep spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: karakeep-assets-external-rclone spec: enableServiceLinks: false - serviceAccountName: karakeep - automountServiceAccountToken: true + serviceAccountName: karakeep-karakeep-assets-external-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -43,6 +43,9 @@ spec: - src:karakeep-assets - dest:karakeep-assets-bcb0bc04dac3e3fd - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-rclone.yaml b/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-rclone.yaml index 475e792c6..cd2f0e4cd 100644 --- a/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-rclone.yaml +++ b/clusters/cl01tl/manifests/karakeep/CronJob-karakeep-karakeep-assets-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-karakeep-assets-remote-0.7.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 namespace: karakeep spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: karakeep-assets-rclone spec: enableServiceLinks: false - serviceAccountName: karakeep - automountServiceAccountToken: true + serviceAccountName: karakeep-karakeep-assets-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -43,6 +43,9 @@ spec: - src:karakeep-assets - dest:karakeep-assets - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config.yaml b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config.yaml index bfbc24d14..04c94eeba 100644 --- a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config namespace: karakeep labels: - helm.sh/chart: rclone-karakeep-assets-external-0.7.0 + helm.sh/chart: rclone-karakeep-assets-external-0.9.0 app.kubernetes.io/instance: karakeep app.kubernetes.io/part-of: karakeep - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-bcb0bc04dac3e3fd-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-destination-config.yaml b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-destination-config.yaml index 07d7ea734..47744645b 100644 --- a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: karakeep-assets-rclone-destination-config namespace: karakeep labels: - helm.sh/chart: rclone-karakeep-assets-remote-0.7.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 app.kubernetes.io/instance: karakeep app.kubernetes.io/part-of: karakeep - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-source-config.yaml b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-source-config.yaml index cb8e003a5..7a55bb501 100644 --- a/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/karakeep/ExternalSecret-karakeep-assets-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: karakeep-assets-rclone-source-config namespace: karakeep labels: - helm.sh/chart: rclone-karakeep-assets-remote-0.7.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 app.kubernetes.io/instance: karakeep app.kubernetes.io/part-of: karakeep - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-external-rclone.yaml b/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-external-rclone.yaml new file mode 100644 index 000000000..ae1b8cec9 --- /dev/null +++ b/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-external-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: karakeep-karakeep-assets-external-rclone + labels: + app.kubernetes.io/instance: karakeep + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: karakeep-assets-external-rclone + app.kubernetes.io/service: karakeep-karakeep-assets-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-karakeep-assets-external-0.9.0 + namespace: karakeep +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: karakeep + app.kubernetes.io/name: karakeep-assets-external-rclone diff --git a/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-rclone.yaml b/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-rclone.yaml new file mode 100644 index 000000000..8e6b55820 --- /dev/null +++ b/clusters/cl01tl/manifests/karakeep/Service-karakeep-karakeep-assets-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: karakeep-karakeep-assets-rclone + labels: + app.kubernetes.io/instance: karakeep + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: karakeep-assets-rclone + app.kubernetes.io/service: karakeep-karakeep-assets-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 + namespace: karakeep +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: karakeep + app.kubernetes.io/name: karakeep-assets-rclone diff --git a/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-external-rclone.yaml b/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-external-rclone.yaml index 650f9f785..5ac46c664 100644 --- a/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-external-rclone.yaml +++ b/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-external-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-karakeep-assets-external-0.7.0 + helm.sh/chart: rclone-karakeep-assets-external-0.9.0 namespace: karakeep diff --git a/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-rclone.yaml b/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-rclone.yaml index dec95f5d2..0a3d78168 100644 --- a/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-rclone.yaml +++ b/clusters/cl01tl/manifests/karakeep/ServiceAccount-karakeep-karakeep-assets-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: karakeep-assets-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-karakeep-assets-remote-0.7.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 namespace: karakeep diff --git a/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-external-rclone.yaml b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-external-rclone.yaml new file mode 100644 index 000000000..a604b21b9 --- /dev/null +++ b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-external-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: karakeep-karakeep-assets-external-rclone + labels: + app.kubernetes.io/instance: karakeep + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: karakeep-assets-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-karakeep-assets-external-0.9.0 + namespace: karakeep +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - karakeep + selector: + matchLabels: + app.kubernetes.io/instance: karakeep-assets-external-rclone + app.kubernetes.io/name: karakeep-assets-external-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-rclone.yaml b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-rclone.yaml new file mode 100644 index 000000000..1a82ae3a0 --- /dev/null +++ b/clusters/cl01tl/manifests/karakeep/ServiceMonitor-karakeep-karakeep-assets-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: karakeep-karakeep-assets-rclone + labels: + app.kubernetes.io/instance: karakeep + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: karakeep-assets-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-karakeep-assets-remote-0.9.0 + namespace: karakeep +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - karakeep + selector: + matchLabels: + app.kubernetes.io/instance: karakeep-assets-rclone + app.kubernetes.io/name: karakeep-assets-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/ntfy/CronJob-ntfy-ntfy-attachments-rclone.yaml b/clusters/cl01tl/manifests/ntfy/CronJob-ntfy-ntfy-attachments-rclone.yaml index 5c699c4f3..c58b95cc4 100644 --- a/clusters/cl01tl/manifests/ntfy/CronJob-ntfy-ntfy-attachments-rclone.yaml +++ b/clusters/cl01tl/manifests/ntfy/CronJob-ntfy-ntfy-attachments-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ntfy-attachments-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-ntfy-attachments-remote-0.7.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 namespace: ntfy spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: ntfy-attachments-rclone spec: enableServiceLinks: false - serviceAccountName: ntfy - automountServiceAccountToken: true + serviceAccountName: ntfy-ntfy-attachments-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -43,6 +43,9 @@ spec: - src:ntfy-attachments - dest:ntfy-attachments - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-destination-config.yaml b/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-destination-config.yaml index f89f11b4f..e8634818c 100644 --- a/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: ntfy-attachments-rclone-destination-config namespace: ntfy labels: - helm.sh/chart: rclone-ntfy-attachments-remote-0.7.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 app.kubernetes.io/instance: ntfy app.kubernetes.io/part-of: ntfy - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ntfy-attachments-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-source-config.yaml b/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-source-config.yaml index a3bd29dbc..6f9de9f6f 100644 --- a/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/ntfy/ExternalSecret-ntfy-attachments-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: ntfy-attachments-rclone-source-config namespace: ntfy labels: - helm.sh/chart: rclone-ntfy-attachments-remote-0.7.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 app.kubernetes.io/instance: ntfy app.kubernetes.io/part-of: ntfy - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ntfy-attachments-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/ntfy/Service-ntfy-ntfy-attachments-rclone.yaml b/clusters/cl01tl/manifests/ntfy/Service-ntfy-ntfy-attachments-rclone.yaml new file mode 100644 index 000000000..20bf121a9 --- /dev/null +++ b/clusters/cl01tl/manifests/ntfy/Service-ntfy-ntfy-attachments-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: ntfy-ntfy-attachments-rclone + labels: + app.kubernetes.io/instance: ntfy + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ntfy-attachments-rclone + app.kubernetes.io/service: ntfy-ntfy-attachments-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 + namespace: ntfy +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: ntfy + app.kubernetes.io/name: ntfy-attachments-rclone diff --git a/clusters/cl01tl/manifests/ntfy/ServiceAccount-ntfy-ntfy-attachments-rclone.yaml b/clusters/cl01tl/manifests/ntfy/ServiceAccount-ntfy-ntfy-attachments-rclone.yaml index 7a414e372..fe2933f29 100644 --- a/clusters/cl01tl/manifests/ntfy/ServiceAccount-ntfy-ntfy-attachments-rclone.yaml +++ b/clusters/cl01tl/manifests/ntfy/ServiceAccount-ntfy-ntfy-attachments-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ntfy-attachments-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-ntfy-attachments-remote-0.7.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 namespace: ntfy diff --git a/clusters/cl01tl/manifests/ntfy/ServiceMonitor-ntfy-ntfy-attachments-rclone.yaml b/clusters/cl01tl/manifests/ntfy/ServiceMonitor-ntfy-ntfy-attachments-rclone.yaml new file mode 100644 index 000000000..6f5ba561d --- /dev/null +++ b/clusters/cl01tl/manifests/ntfy/ServiceMonitor-ntfy-ntfy-attachments-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: ntfy-ntfy-attachments-rclone + labels: + app.kubernetes.io/instance: ntfy + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: ntfy-attachments-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-ntfy-attachments-remote-0.9.0 + namespace: ntfy +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - ntfy + selector: + matchLabels: + app.kubernetes.io/instance: ntfy-attachments-rclone + app.kubernetes.io/name: ntfy-attachments-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-external-rclone.yaml b/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-external-rclone.yaml index 44018fdea..fb52b6264 100644 --- a/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-external-rclone.yaml +++ b/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-external-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: openbao-backups-external-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-openbao-backups-external-0.7.0 + helm.sh/chart: rclone-openbao-backups-external-0.9.0 namespace: openbao spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: openbao-backups-external-rclone spec: enableServiceLinks: false - serviceAccountName: default - automountServiceAccountToken: true + serviceAccountName: openbao-openbao-backups-external-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -44,6 +44,9 @@ spec: - --min-age - 90d - --verbose + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 env: - name: RCLONE_CONFIG_DEST_TYPE value: s3 @@ -83,6 +86,9 @@ spec: - --s3-no-check-bucket - --max-age - 90d + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-remote-rclone.yaml index 6e1de331e..fc5399e63 100644 --- a/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/openbao/CronJob-openbao-openbao-backups-remote-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: openbao-backups-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-openbao-backups-remote-0.7.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 namespace: openbao spec: suspend: false @@ -30,8 +30,8 @@ spec: app.kubernetes.io/name: openbao-backups-remote-rclone spec: enableServiceLinks: false - serviceAccountName: default - automountServiceAccountToken: true + serviceAccountName: openbao-openbao-backups-remote-rclone + automountServiceAccountToken: false hostIPC: false hostNetwork: false hostPID: false @@ -44,6 +44,9 @@ spec: - --min-age - 90d - --verbose + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 env: - name: RCLONE_CONFIG_DEST_TYPE value: s3 @@ -83,6 +86,9 @@ spec: - --s3-no-check-bucket - --max-age - 90d + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-1.yaml b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-1.yaml index ae40ef7b4..82e0bab3e 100644 --- a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-1.yaml +++ b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-1.yaml @@ -27,7 +27,7 @@ spec: app.kubernetes.io/name: openbao spec: enableServiceLinks: false - serviceAccountName: default + serviceAccountName: openbao automountServiceAccountToken: false hostIPC: false hostNetwork: false diff --git a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-2.yaml b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-2.yaml index ebe796ad4..e85a33b10 100644 --- a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-2.yaml +++ b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-2.yaml @@ -27,7 +27,7 @@ spec: app.kubernetes.io/name: openbao spec: enableServiceLinks: false - serviceAccountName: default + serviceAccountName: openbao automountServiceAccountToken: false hostIPC: false hostNetwork: false diff --git a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-3.yaml b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-3.yaml index 2bdd3e120..82ee4defc 100644 --- a/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-3.yaml +++ b/clusters/cl01tl/manifests/openbao/Deployment-openbao-unseal-unseal-3.yaml @@ -27,7 +27,7 @@ spec: app.kubernetes.io/name: openbao spec: enableServiceLinks: false - serviceAccountName: default + serviceAccountName: openbao automountServiceAccountToken: false hostIPC: false hostNetwork: false diff --git a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-038053cd180284dc-rclone-destination-config.yaml b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-038053cd180284dc-rclone-destination-config.yaml index 287a170a3..db6f4cade 100644 --- a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-038053cd180284dc-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-038053cd180284dc-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: openbao-backups-038053cd180284dc-rclone-destination-config namespace: openbao labels: - helm.sh/chart: rclone-openbao-backups-external-0.7.0 + helm.sh/chart: rclone-openbao-backups-external-0.9.0 app.kubernetes.io/instance: openbao app.kubernetes.io/part-of: openbao - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: openbao-backups-038053cd180284dc-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-destination-config.yaml b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-destination-config.yaml index f6d0cc1eb..f3a4cb6be 100644 --- a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: openbao-backups-rclone-destination-config namespace: openbao labels: - helm.sh/chart: rclone-openbao-backups-remote-0.7.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 app.kubernetes.io/instance: openbao app.kubernetes.io/part-of: openbao - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: openbao-backups-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-source-config.yaml b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-source-config.yaml index dd749856a..ddf334770 100644 --- a/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/openbao/ExternalSecret-openbao-backups-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: openbao-backups-rclone-source-config namespace: openbao labels: - helm.sh/chart: rclone-openbao-backups-remote-0.7.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 app.kubernetes.io/instance: openbao app.kubernetes.io/part-of: openbao - app.kubernetes.io/version: "0.7.0" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: openbao-backups-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-external-rclone.yaml b/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-external-rclone.yaml new file mode 100644 index 000000000..ecf45d60c --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-external-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: openbao-openbao-backups-external-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-external-rclone + app.kubernetes.io/service: openbao-openbao-backups-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-external-0.9.0 + namespace: openbao +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: openbao + app.kubernetes.io/name: openbao-backups-external-rclone diff --git a/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-remote-rclone.yaml new file mode 100644 index 000000000..ec714588e --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/Service-openbao-openbao-backups-remote-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: openbao-openbao-backups-remote-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-remote-rclone + app.kubernetes.io/service: openbao-openbao-backups-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 + namespace: openbao +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: openbao + app.kubernetes.io/name: openbao-backups-remote-rclone diff --git a/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-external-rclone.yaml b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-external-rclone.yaml new file mode 100644 index 000000000..9e546142c --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-external-rclone.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: openbao-openbao-backups-external-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-external-0.9.0 + namespace: openbao diff --git a/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-remote-rclone.yaml new file mode 100644 index 000000000..d8cda8385 --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-openbao-backups-remote-rclone.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: openbao-openbao-backups-remote-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 + namespace: openbao diff --git a/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-unseal.yaml b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-unseal.yaml new file mode 100644 index 000000000..2a540afa8 --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/ServiceAccount-openbao-unseal.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: openbao-unseal + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao + helm.sh/chart: unseal-5.0.0 + namespace: openbao diff --git a/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-external-rclone.yaml b/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-external-rclone.yaml new file mode 100644 index 000000000..52046f827 --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-external-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: openbao-openbao-backups-external-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-external-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-external-0.9.0 + namespace: openbao +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - openbao + selector: + matchLabels: + app.kubernetes.io/instance: openbao-backups-external-rclone + app.kubernetes.io/name: openbao-backups-external-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-remote-rclone.yaml b/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-remote-rclone.yaml new file mode 100644 index 000000000..ccced3778 --- /dev/null +++ b/clusters/cl01tl/manifests/openbao/ServiceMonitor-openbao-openbao-backups-remote-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: openbao-openbao-backups-remote-rclone + labels: + app.kubernetes.io/instance: openbao + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: openbao-backups-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-openbao-backups-remote-0.9.0 + namespace: openbao +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - openbao + selector: + matchLabels: + app.kubernetes.io/instance: openbao-backups-remote-rclone + app.kubernetes.io/name: openbao-backups-remote-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s diff --git a/clusters/cl01tl/manifests/rclone/CronJob-rclone-web-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/rclone/CronJob-rclone-web-assets-remote-rclone.yaml index 2f5ea365c..bb20c6f0d 100644 --- a/clusters/cl01tl/manifests/rclone/CronJob-rclone-web-assets-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/rclone/CronJob-rclone-web-assets-remote-rclone.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: web-assets-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-web-assets-remote-0.8.1 + helm.sh/chart: rclone-web-assets-remote-0.9.0 namespace: rclone spec: suspend: false @@ -30,7 +30,7 @@ spec: app.kubernetes.io/name: web-assets-remote-rclone spec: enableServiceLinks: false - serviceAccountName: rclone + serviceAccountName: rclone-web-assets-remote-rclone automountServiceAccountToken: false hostIPC: false hostNetwork: false @@ -43,6 +43,9 @@ spec: - src:web-assets-770aef58c931fcf4 - dest:web-assets - --s3-no-check-bucket + - --rc + - --rc-enable-metrics + - --metrics-addr=0.0.0.0:5572 - --verbose env: - name: RCLONE_S3_PROVIDER diff --git a/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-770aef58c931fcf4-rclone-source-config.yaml b/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-770aef58c931fcf4-rclone-source-config.yaml index 359884960..62e3ae0a1 100644 --- a/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-770aef58c931fcf4-rclone-source-config.yaml +++ b/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-770aef58c931fcf4-rclone-source-config.yaml @@ -4,10 +4,10 @@ metadata: name: web-assets-770aef58c931fcf4-rclone-source-config namespace: rclone labels: - helm.sh/chart: rclone-web-assets-remote-0.8.1 + helm.sh/chart: rclone-web-assets-remote-0.9.0 app.kubernetes.io/instance: rclone app.kubernetes.io/part-of: rclone - app.kubernetes.io/version: "0.8.1" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: web-assets-770aef58c931fcf4-rclone-source-config spec: diff --git a/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-rclone-destination-config.yaml b/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-rclone-destination-config.yaml index 1a18b51d4..a3bc7cf2e 100644 --- a/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-rclone-destination-config.yaml +++ b/clusters/cl01tl/manifests/rclone/ExternalSecret-web-assets-rclone-destination-config.yaml @@ -4,10 +4,10 @@ metadata: name: web-assets-rclone-destination-config namespace: rclone labels: - helm.sh/chart: rclone-web-assets-remote-0.8.1 + helm.sh/chart: rclone-web-assets-remote-0.9.0 app.kubernetes.io/instance: rclone app.kubernetes.io/part-of: rclone - app.kubernetes.io/version: "0.8.1" + app.kubernetes.io/version: "0.9.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: web-assets-rclone-destination-config spec: diff --git a/clusters/cl01tl/manifests/rclone/Service-rclone-web-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/rclone/Service-rclone-web-assets-remote-rclone.yaml new file mode 100644 index 000000000..c904e569d --- /dev/null +++ b/clusters/cl01tl/manifests/rclone/Service-rclone-web-assets-remote-rclone.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: rclone-web-assets-remote-rclone + labels: + app.kubernetes.io/instance: rclone + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: web-assets-remote-rclone + app.kubernetes.io/service: rclone-web-assets-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-web-assets-remote-0.9.0 + namespace: rclone +spec: + type: ClusterIP + ports: + - port: 5572 + targetPort: 5572 + protocol: TCP + name: metrics + selector: + app.kubernetes.io/controller: main + app.kubernetes.io/instance: rclone + app.kubernetes.io/name: web-assets-remote-rclone diff --git a/clusters/cl01tl/manifests/rclone/ServiceAccount-rclone-web-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/rclone/ServiceAccount-rclone-web-assets-remote-rclone.yaml index 33066d8ca..165cd1fed 100644 --- a/clusters/cl01tl/manifests/rclone/ServiceAccount-rclone-web-assets-remote-rclone.yaml +++ b/clusters/cl01tl/manifests/rclone/ServiceAccount-rclone-web-assets-remote-rclone.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: web-assets-remote-rclone app.kubernetes.io/version: v1.74.0 - helm.sh/chart: rclone-web-assets-remote-0.8.1 + helm.sh/chart: rclone-web-assets-remote-0.9.0 namespace: rclone diff --git a/clusters/cl01tl/manifests/rclone/ServiceMonitor-rclone-web-assets-remote-rclone.yaml b/clusters/cl01tl/manifests/rclone/ServiceMonitor-rclone-web-assets-remote-rclone.yaml new file mode 100644 index 000000000..28bf55c12 --- /dev/null +++ b/clusters/cl01tl/manifests/rclone/ServiceMonitor-rclone-web-assets-remote-rclone.yaml @@ -0,0 +1,25 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: rclone-web-assets-remote-rclone + labels: + app.kubernetes.io/instance: rclone + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: web-assets-remote-rclone + app.kubernetes.io/version: v1.74.0 + helm.sh/chart: rclone-web-assets-remote-0.9.0 + namespace: rclone +spec: + jobLabel: app.kubernetes.io/name + namespaceSelector: + matchNames: + - rclone + selector: + matchLabels: + app.kubernetes.io/instance: web-assets-remote-rclone + app.kubernetes.io/name: web-assets-remote-rclone + endpoints: + - interval: 30s + path: /metrics + port: metrics + scrapeTimeout: 10s