From c26ae15ff5e5937710363cbbe06ef29131297187 Mon Sep 17 00:00:00 2001
From: Alexander Rogov <i_am@rogov.al>
Date: Sun, 12 Jul 2026 19:37:11 +0300
Subject: [PATCH] change s3 to a minio operator in mastodon app

---
 argocd/apps/mastodon.yaml       |  3 +--
 manifests/mastodon/secrets.yaml | 10 ++++++++++
 manifests/minio/secrets.yaml    | 15 +++++++++++++--
 manifests/minio/tenant.yaml     |  2 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/argocd/apps/mastodon.yaml b/argocd/apps/mastodon.yaml
index f79f4ae..80ee41b 100644
--- a/argocd/apps/mastodon.yaml
+++ b/argocd/apps/mastodon.yaml
@@ -36,8 +36,7 @@ spec:
               endpoint: minio.minio.svc.cluster.local:9000
               protocol: http
               bucket: mastodon
-              accessKeyId: admin
-              secretAccessKey: change-me
+              existingSecret: mastodon-s3
               overridePathStyle: "true"
 
             web:
diff --git a/manifests/mastodon/secrets.yaml b/manifests/mastodon/secrets.yaml
index ae73d5c..82c1621 100644
--- a/manifests/mastodon/secrets.yaml
+++ b/manifests/mastodon/secrets.yaml
@@ -16,3 +16,13 @@ metadata:
 type: Opaque
 data:
   ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUV4akNDQTY2Z0F3SUJBZ0lVRFdRSm1XWjl4QlRzUVVlT3Q5RjVZU1BwcU9Jd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZOHhFekFSQmdvSmtpYUprL0lzWkFFWkZnTmpiMjB4RnpBVkJnb0praWFKay9Jc1pBRVpGZ2RsZUdGdApjR3hsTVJrd0Z3WURWUVFLREJCRmVHRnRjR3hsSUVOdmJTQkpibU11TVNFd0h3WURWUVFMREJoRmVHRnRjR3hsCklFTnZiU0JKYm1NdUlGSnZiM1FnUTBFeElUQWZCZ05WQkFNTUdFVjRZVzF3YkdVZ1EyOXRJRWx1WXk0Z1VtOXYKZENCRFFUQWVGdzB5TkRBeU1qQXhOekF3TXpaYUZ3MHpOREF5TVRjeE56QXdNelphTUlHUE1STXdFUVlLQ1pJbQppWlB5TEdRQkdSWURZMjl0TVJjd0ZRWUtDWkltaVpQeUxHUUJHUllIWlhoaGJYQnNaVEVaTUJjR0ExVUVDZ3dRClJYaGhiWEJzWlNCRGIyMGdTVzVqTGpFaE1COEdBMVVFQ3d3WVJYaGhiWEJzWlNCRGIyMGdTVzVqTGlCU2IyOTAKSUVOQk1TRXdId1lEVlFRRERCaEZlR0Z0Y0d4bElFTnZiU0JKYm1NdUlGSnZiM1FnUTBFd2dnRWlNQTBHQ1NxRwpTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFERVB5TjdKOVZHUHlKY1FtQ0JsNVRHd2ZTenZWZFd3b1FVCmo5YUVzZGZGSjZwQkNEUVNzajhMdjRScUwwZFpyYTdoN1NwWkxMWC9ZWmNuamlrcllDK3JQNU93c0k5eEVFLzQKVTk4Q3NUQlBoSU1ncUZLNlN6TkU1NDk0QnNBazRjTDcyZE9PYzh0WDE5b0RTL1B2QlVMYk5rdGhRMGFBRjFkZwp2YnJIdnU3aHE3TGlzQjVaUkdIVkUxay9BYkNzMlBhYUtrbjJqQ3cvYitVME1sOXFQdXVFZ3oybUFxSkRHWW9BCldTUjRZWHJPY3JtUHVScWJ3czQ2NFlaYkpXODk4LzBQbi9VMzAwZWQrNFlIaU5ZTExKcDUxQU1rUjRZRXc5NjkKVlJQYldJdkxyZDBQUUJvb0MvZUxyTDZydnVkL0dwWWhkUUVVeDhxY05DS2Q0YnozT2FRNUFnTUJBQUdqZ2dFVwpNSUlCRWpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUE0R0ExVWREd0VCL3dRRUF3SUJoakFkQmdOVkhRNEVGZ1FVCkY0ZmZvRnJyWmhLbjFkRDR1aEpGUExjckFKd3dnYzhHQTFVZEl3U0J4ekNCeElBVUY0ZmZvRnJyWmhLbjFkRDQKdWhKRlBMY3JBSnloZ1pXa2daSXdnWTh4RXpBUkJnb0praWFKay9Jc1pBRVpGZ05qYjIweEZ6QVZCZ29Ka2lhSgprL0lzWkFFWkZnZGxlR0Z0Y0d4bE1Sa3dGd1lEVlFRS0RCQkZlR0Z0Y0d4bElFTnZiU0JKYm1NdU1TRXdId1lEClZRUUxEQmhGZUdGdGNHeGxJRU52YlNCSmJtTXVJRkp2YjNRZ1EwRXhJVEFmQmdOVkJBTU1HRVY0WVcxd2JHVWcKUTI5dElFbHVZeTRnVW05dmRDQkRRWUlVRFdRSm1XWjl4QlRzUVVlT3Q5RjVZU1BwcU9Jd0RRWUpLb1pJaHZjTgpBUUVMQlFBRGdnRUJBTDNRM0FIVWhNaUxVeTZPbExTdDh3WDlJMm9OR0RLYkJ1MGF0cFVORHp0ay8wczNZTFFDCll1WGdONEtySWNNWFFJdUFYQ3g0MDdjK3BJbFQvVDFGTm4rVlFYd2k1NlBZenhRS3RscG9LVUwzb1BRRTFkMFYKNkVvaU5rKzZVb2R2eVpxcGRRdTdmWFZlbnRSTWsxUVg3RDlvdG1paU51WCtHU3hKaEpDMkx5enc2NU85RVVnRwoxeVZKb242UmtVR3RxQnFLSXVMa3NLd0VyLy9FTG5qbVhpdDRMUUtTbnFLcjBGVENCN3NlSXJLSk55YjM1UW5xCnF5OWEvVW5ob2tybWRkYTF0cjZNYnFVOGw3SG14THVTZC9LeStMMGVETnRZdjZZZk1ld3RqZzBUdEFuRnlRb3YKcmRYbWVxMWR5OUhMbzNEczRBRnozR3g5MDc2VHhjUlMvaUk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mastodon-s3
+  namespace: mastodon
+type: Opaque
+stringData:
+  access-key-id: mastodon
+  secret-access-key: "jZnXD&f0M6T4Fk95"
diff --git a/manifests/minio/secrets.yaml b/manifests/minio/secrets.yaml
index 5620348..ca0f174 100644
--- a/manifests/minio/secrets.yaml
+++ b/manifests/minio/secrets.yaml
@@ -5,5 +5,16 @@ metadata:
   namespace: minio
 type: Opaque
 stringData:
-  accesskey: admin
-  secretkey: change-me
+  config.env: |-
+    export MINIO_ROOT_USER="admin"
+    export MINIO_ROOT_PASSWORD="jZnXD&f0M6T4Fk95"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mastodon
+  namespace: minio
+type: Opaque
+stringData:
+  CONSOLE_ACCESS_KEY: mastodon
+  CONSOLE_SECRET_KEY: "jZnXD&f0M6T4Fk95"
diff --git a/manifests/minio/tenant.yaml b/manifests/minio/tenant.yaml
index a89fb4c..21e4387 100644
--- a/manifests/minio/tenant.yaml
+++ b/manifests/minio/tenant.yaml
@@ -29,5 +29,7 @@ spec:
     name: shared-minio-creds
   mountPath: /export
   requestAutoCert: false
+  users:
+    - name: mastodon
   buckets:
     - name: mastodon