From 57dd6a5dd43d6b3e90ffe12a66fb9b8d39514918 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Sun, 26 Apr 2026 17:09:46 +0000 Subject: [PATCH] chore: Update manifests after change --- ...nJob-directus-directus-assets-rclone.yaml} | 38 ++++++++++--------- ...ctus-assets-rclone-destination-config.yaml | 33 ++++++++++++++++ ...directus-assets-rclone-source-config.yaml} | 25 ++++++------ 3 files changed, 65 insertions(+), 31 deletions(-) rename clusters/cl01tl/manifests/{rclone/CronJob-rclone-directus-assets.yaml => directus/CronJob-directus-directus-assets-rclone.yaml} (73%) create mode 100644 clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml rename clusters/cl01tl/manifests/{rclone/ExternalSecret-garage-directus-secret.yaml => directus/ExternalSecret-directus-assets-rclone-source-config.yaml} (65%) diff --git a/clusters/cl01tl/manifests/rclone/CronJob-rclone-directus-assets.yaml b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-rclone.yaml similarity index 73% rename from clusters/cl01tl/manifests/rclone/CronJob-rclone-directus-assets.yaml rename to clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-rclone.yaml index 120e9b5b9..23bccbba9 100644 --- a/clusters/cl01tl/manifests/rclone/CronJob-rclone-directus-assets.yaml +++ b/clusters/cl01tl/manifests/directus/CronJob-directus-directus-assets-rclone.yaml @@ -1,14 +1,15 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: rclone-directus-assets + name: directus-directus-assets-rclone labels: - app.kubernetes.io/controller: directus-assets - app.kubernetes.io/instance: rclone + app.kubernetes.io/controller: main + app.kubernetes.io/instance: directus app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: rclone - helm.sh/chart: rclone-4.6.2 - namespace: rclone + app.kubernetes.io/name: directus-assets-rclone + app.kubernetes.io/version: v1.73.5 + helm.sh/chart: rclone-directus-assets-remote-0.2.0 + namespace: directus spec: suspend: false concurrencyPolicy: Forbid @@ -24,9 +25,9 @@ spec: template: metadata: labels: - app.kubernetes.io/controller: directus-assets - app.kubernetes.io/instance: rclone - app.kubernetes.io/name: rclone + app.kubernetes.io/controller: main + app.kubernetes.io/instance: directus + app.kubernetes.io/name: directus-assets-rclone spec: enableServiceLinks: false serviceAccountName: default @@ -56,22 +57,22 @@ spec: valueFrom: secretKeyRef: key: ACCESS_KEY_ID - name: garage-directus-secret + name: directus-assets-rclone-source-config - name: RCLONE_CONFIG_SRC_SECRET_ACCESS_KEY valueFrom: secretKeyRef: key: ACCESS_SECRET_KEY - name: garage-directus-secret + name: directus-assets-rclone-source-config - name: RCLONE_CONFIG_SRC_REGION valueFrom: secretKeyRef: key: ACCESS_REGION - name: garage-directus-secret + name: directus-assets-rclone-source-config - name: RCLONE_CONFIG_SRC_ENDPOINT valueFrom: secretKeyRef: key: SRC_ENDPOINT - name: garage-directus-secret + name: directus-assets-rclone-source-config - name: RCLONE_CONFIG_SRC_S3_FORCE_PATH_STYLE value: "true" - name: RCLONE_CONFIG_DEST_TYPE @@ -84,23 +85,24 @@ spec: valueFrom: secretKeyRef: key: ACCESS_KEY_ID - name: garage-directus-secret + name: directus-assets-rclone-destination-config - name: RCLONE_CONFIG_DEST_SECRET_ACCESS_KEY valueFrom: secretKeyRef: key: ACCESS_SECRET_KEY - name: garage-directus-secret + name: directus-assets-rclone-destination-config - name: RCLONE_CONFIG_DEST_REGION valueFrom: secretKeyRef: key: ACCESS_REGION - name: garage-directus-secret + name: directus-assets-rclone-destination-config - name: RCLONE_CONFIG_DEST_ENDPOINT valueFrom: secretKeyRef: key: DEST_ENDPOINT - name: garage-directus-secret - - name: RCLONE_CONFIG_DEST_S3_FORCE_PATH_STYLE + name: directus-assets-rclone-destination-config + - name: RCLONE_CONFIG_SRC_DEST_FORCE_PATH_STYLE value: "true" image: rclone/rclone:1.73.5@sha256:1619a625f845e169c34b952cf40c483c0392965b821c5155cde8cbfd35254a96 + imagePullPolicy: IfNotPresent name: sync 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 new file mode 100644 index 000000000..79fcb2101 --- /dev/null +++ b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-destination-config.yaml @@ -0,0 +1,33 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: directus-assets-rclone-destination-config + namespace: directus + labels: + helm.sh/chart: rclone-directus-assets-remote-0.2.0 + app.kubernetes.io/instance: directus + app.kubernetes.io/part-of: directus + app.kubernetes.io/version: "0.2.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-rclone-destination-config +spec: + secretStoreRef: + kind: ClusterSecretStore + name: openbao + data: + - secretKey: ACCESS_KEY_ID + remoteRef: + key: /garage/home-infra/directus-assets + property: ACCESS_KEY_ID + - secretKey: ACCESS_SECRET_KEY + remoteRef: + key: /garage/home-infra/directus-assets + property: ACCESS_KEY_ID + - secretKey: ACCESS_REGION + remoteRef: + key: /garage/home-infra/directus-assets + property: ACCESS_KEY_ID + - secretKey: DEST_ENDPOINT + remoteRef: + key: /garage/config + property: ENDPOINT_REMOTE diff --git a/clusters/cl01tl/manifests/rclone/ExternalSecret-garage-directus-secret.yaml b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml similarity index 65% rename from clusters/cl01tl/manifests/rclone/ExternalSecret-garage-directus-secret.yaml rename to clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml index 215552565..6b387b5bb 100644 --- a/clusters/cl01tl/manifests/rclone/ExternalSecret-garage-directus-secret.yaml +++ b/clusters/cl01tl/manifests/directus/ExternalSecret-directus-assets-rclone-source-config.yaml @@ -1,12 +1,15 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: garage-directus-secret - namespace: rclone + name: directus-assets-rclone-source-config + namespace: directus labels: - app.kubernetes.io/name: garage-directus-secret - app.kubernetes.io/instance: rclone - app.kubernetes.io/part-of: rclone + helm.sh/chart: rclone-directus-assets-remote-0.2.0 + app.kubernetes.io/instance: directus + app.kubernetes.io/part-of: directus + app.kubernetes.io/version: "0.2.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: directus-assets-rclone-source-config spec: secretStoreRef: kind: ClusterSecretStore @@ -16,19 +19,15 @@ spec: remoteRef: key: /garage/home-infra/directus-assets property: ACCESS_KEY_ID - - secretKey: ACCESS_REGION - remoteRef: - key: /garage/home-infra/directus-assets - property: ACCESS_REGION - secretKey: ACCESS_SECRET_KEY remoteRef: key: /garage/home-infra/directus-assets property: ACCESS_SECRET_KEY + - secretKey: ACCESS_REGION + remoteRef: + key: /garage/home-infra/directus-assets + property: ACCESS_REGION - secretKey: SRC_ENDPOINT remoteRef: key: /garage/config property: ENDPOINT_LOCAL - - secretKey: DEST_ENDPOINT - remoteRef: - key: /garage/config - property: ENDPOINT_REMOTE