diff --git a/garage/migrate/kustomization.yaml b/garage/migrate/kustomization.yaml new file mode 100644 index 0000000..be12823 --- /dev/null +++ b/garage/migrate/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: garage + +resources: +- resources/job.migrate.yaml +- resources/secret.rclone.yaml \ No newline at end of file diff --git a/garage/migrate/resources/job.migrate.yaml b/garage/migrate/resources/job.migrate.yaml new file mode 100644 index 0000000..fc20804 --- /dev/null +++ b/garage/migrate/resources/job.migrate.yaml @@ -0,0 +1,33 @@ +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: sync-garage-snips + namespace: garage +spec: + ttlSecondsAfterFinished: 100 + template: + spec: + containers: + - name: rclone + image: rclone/rclone + args: + - sync + - -P + - --update + - --no-update-modtime + - --no-update-dir-modtime + - --ignore-errors + - -s3-upload-concurrency 64 + - -v + - r2:backup/snips + - garage:backup/snips + volumeMounts: + - name: rclone-config + mountPath: /config/rclone + restartPolicy: Never + volumes: + - name: rclone-config + secret: + secretName: rclone-config + defaultMode: 420 diff --git a/garage/migrate/resources/secret.rclone.yaml b/garage/migrate/resources/secret.rclone.yaml new file mode 100644 index 0000000..cde341b Binary files /dev/null and b/garage/migrate/resources/secret.rclone.yaml differ diff --git a/snips/.gitattributes b/snips/.gitattributes index 8efbf43..0016a56 100644 --- a/snips/.gitattributes +++ b/snips/.gitattributes @@ -1,2 +1 @@ secret.*.yaml filter=age diff=age merge=age -text -litestream.yml filter=age diff=age merge=age -text diff --git a/snips/config/litestream.yml b/snips/config/litestream.yml index 19dab22..23d1dc7 100644 Binary files a/snips/config/litestream.yml and b/snips/config/litestream.yml differ diff --git a/snips/resources/secret.snips.yaml b/snips/resources/secret.snips.yaml index 60eb205..f02361d 100644 Binary files a/snips/resources/secret.snips.yaml and b/snips/resources/secret.snips.yaml differ diff --git a/snips/resources/statefulset.yaml b/snips/resources/statefulset.yaml index b356f64..892fbdc 100644 --- a/snips/resources/statefulset.yaml +++ b/snips/resources/statefulset.yaml @@ -29,12 +29,12 @@ spec: valueFrom: secretKeyRef: name: snips-secrets - key: r2-access-key + key: garage-access-key - name: LITESTREAM_SECRET_ACCESS_KEY valueFrom: secretKeyRef: name: snips-secrets - key: r2-secret-key + key: garage-secret-key containers: - name: snips image: snips @@ -91,12 +91,12 @@ spec: valueFrom: secretKeyRef: name: snips-secrets - key: r2-access-key + key: garage-access-key - name: LITESTREAM_SECRET_ACCESS_KEY valueFrom: secretKeyRef: name: snips-secrets - key: r2-secret-key + key: garage-secret-key readinessProbe: httpGet: path: /metrics