From e7150b295cc1193497231ad47309a2ff29cfc61d Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Thu, 16 Nov 2023 23:07:07 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20debug-s1=E3=81=AEstateful-set.yaml?=
 =?UTF-8?q?=E3=81=AEinitContainers=E3=81=ABmod-downloader=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/debug-s1/stateful-set.yaml      | 21 +++++++++++++++++++
 terraform/onp_cluster_minecraft_secrets.tf    |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
index c50869b8c..c262d069f 100644
--- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
+++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
@@ -33,6 +33,27 @@ spec:
             - "sh"
             - "-c"
             - 'wget -O /root/jmx-exporter-download/jmx-exporter-javaagent.jar "${JMX_EXPORTER_URL}"'
+        - name: mod-downloader
+          image: ghcr.io/giganticminecraft/mod-downloader:sha-8326d06
+          env:
+            - name: MINIO_ENDPOINT
+              value: seichi-private-plugin-blackhole-minio-console.minio:9001
+            - name: MINIO_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: mcserver--common--config-secrets
+                  key: MINIO_DEBUG_ACCESS_KEY
+            - name: MINIO_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: mcserver--common--config-secrets
+                  key: MINIO_DEBUG_ACCESS_SECRET
+            - name: BUCKET_NAME
+              value: seichi-plugins
+            - name: BUCKET_PREFIX_NAME
+              value: deb-1-18-2
+            - name: DOWNLOAD_TARGET_DIR_PATH
+              value: /plugins
 
       containers:
         - resources:
diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf
index 25dc63bbb..d6fe8c923 100644
--- a/terraform/onp_cluster_minecraft_secrets.tf
+++ b/terraform/onp_cluster_minecraft_secrets.tf
@@ -8,6 +8,8 @@ resource "kubernetes_secret" "onp_minecraft_debug_secrets" {
 
   data = {
     DISCORDSRV_TOKEN = var.minecraft__discordsrv_bot_token
+    MINIO_DEBUG_ACCESS_KEY = var.minio_debug_access_key
+    MINIO_DEBUG_ACCESS_SECRET = var.minio_debug_access_secret
   }
 
   type = "Opaque"

From bab967e0276217f61e7164212c2e73bb2b576f17 Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Thu, 16 Nov 2023 23:17:53 +0900
Subject: [PATCH 2/3] style: terraform fmt

---
 terraform/onp_cluster_minecraft_secrets.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf
index d6fe8c923..8329add98 100644
--- a/terraform/onp_cluster_minecraft_secrets.tf
+++ b/terraform/onp_cluster_minecraft_secrets.tf
@@ -7,8 +7,8 @@ resource "kubernetes_secret" "onp_minecraft_debug_secrets" {
   }
 
   data = {
-    DISCORDSRV_TOKEN = var.minecraft__discordsrv_bot_token
-    MINIO_DEBUG_ACCESS_KEY = var.minio_debug_access_key
+    DISCORDSRV_TOKEN          = var.minecraft__discordsrv_bot_token
+    MINIO_DEBUG_ACCESS_KEY    = var.minio_debug_access_key
     MINIO_DEBUG_ACCESS_SECRET = var.minio_debug_access_secret
   }
 

From dd6e676f65380c1b4dc94829228c9565c04349e0 Mon Sep 17 00:00:00 2001
From: rito528 <39003544+rito528@users.noreply.github.com>
Date: Sun, 19 Nov 2023 01:22:16 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E3=82=92secret=E3=81=AB=E3=81=99=E3=82=8B=E3=81=B9?=
 =?UTF-8?q?=E3=81=8D=E3=81=A8=E3=81=93=E3=82=8D=E3=81=A7key=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/debug-s1/stateful-set.yaml                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
index c262d069f..fc5498f29 100644
--- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
+++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
@@ -43,7 +43,7 @@ spec:
                 secretKeyRef:
                   name: mcserver--common--config-secrets
                   key: MINIO_DEBUG_ACCESS_KEY
-            - name: MINIO_ACCESS_KEY
+            - name: MINIO_ACCESS_SECRET
               valueFrom:
                 secretKeyRef:
                   name: mcserver--common--config-secrets