From 9f13652516f4faa150124bd3da25846c159e6c0c Mon Sep 17 00:00:00 2001 From: outductor Date: Fri, 22 Dec 2023 01:25:44 +0900 Subject: [PATCH 1/3] Add S1 world --- .../templates/debug-s1/seichiassist.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml index d9886a4f2..5d090a5ef 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml @@ -57,6 +57,18 @@ spec: volumeMounts: - name: mod-downloader-volume mountPath: /plugins + - name: world-downloader + image: busybox:1.36.1 + env: + - name: WORLD_URL # S1からインポートしてきたワールドデータ + value: "http://seichi-private-plugin-blackhole-minio.minio:9000/seichi-plugins/world.tar.gz" + volumeMounts: + - name: world-download-volume + mountPath: /data + command: + - "sh" + - "-c" + - 'wget -qO- "${WORLD_URL}" | tar -xz -C /data' containers: - resources: @@ -244,6 +256,8 @@ spec: - name: jmx-exporter-download-volume mountPath: /jmx-exporter/jmx-exporter-javaagent.jar subPath: jmx-exporter-javaagent.jar + - name: world-download-volume + mountPath: /data/world - name: common-jmx-exporter-config mountPath: /jmx-exporter/jmx-exporter-config.yaml subPath: jmx-exporter-config.yaml @@ -268,6 +282,8 @@ spec: # JMX exporterをinitContainerでダウンロードしてBugneeCordに受け渡すためのvolume - name: jmx-exporter-download-volume emptyDir: {} + - name: world-download-volume + emptyDir: {} - name: common-jmx-exporter-config configMap: name: common-jmx-exporter-config From 24c910c28a720f5f89bc792232408e6883442df4 Mon Sep 17 00:00:00 2001 From: outductor Date: Fri, 22 Dec 2023 01:26:48 +0900 Subject: [PATCH 2/3] fix placement --- .../templates/debug-s1/seichiassist.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml index 5d090a5ef..1ea30eff9 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml @@ -256,8 +256,6 @@ spec: - name: jmx-exporter-download-volume mountPath: /jmx-exporter/jmx-exporter-javaagent.jar subPath: jmx-exporter-javaagent.jar - - name: world-download-volume - mountPath: /data/world - name: common-jmx-exporter-config mountPath: /jmx-exporter/jmx-exporter-config.yaml subPath: jmx-exporter-config.yaml @@ -265,6 +263,9 @@ spec: - name: mod-downloader-volume mountPath: /plugins + - name: world-download-volume + mountPath: /data/world + volumes: - name: common-mcserver-configs configMap: From 628213c955f1a1048249722c0ee18dda4eabc3d5 Mon Sep 17 00:00:00 2001 From: outductor Date: Fri, 22 Dec 2023 01:27:52 +0900 Subject: [PATCH 3/3] fix placement --- .../templates/debug-s1/seichiassist.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml index 1ea30eff9..7759f5848 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/seichiassist.yaml @@ -283,8 +283,6 @@ spec: # JMX exporterをinitContainerでダウンロードしてBugneeCordに受け渡すためのvolume - name: jmx-exporter-download-volume emptyDir: {} - - name: world-download-volume - emptyDir: {} - name: common-jmx-exporter-config configMap: name: common-jmx-exporter-config @@ -292,3 +290,7 @@ spec: # mod-downloaderからプラグインをinitContainerでダウンロードしてBugneeCordに受け渡すためのvolume - name: mod-downloader-volume emptyDir: {} + + # S1から取ってきたワールドデータをぶちこむボリューム + - name: world-download-volume + emptyDir: {}