From 9734c8ff213659ffc9384c6d2aeb6d1244a47c8e Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sun, 19 Nov 2023 15:36:03 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20minio=E3=81=AEaccess-key=E3=81=A8acc?= =?UTF-8?q?ess-secret=E3=82=92minio-access-secret=E3=81=8B=E3=82=89?= =?UTF-8?q?=E5=8F=96=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/debug-s1/stateful-set.yaml | 8 ++++---- terraform/onp_cluster_minecraft_secrets.tf | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) 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 05f1fab46..60983bcce 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 @@ -41,13 +41,13 @@ spec: - name: MINIO_ACCESS_KEY valueFrom: secretKeyRef: - name: mcserver--common--config-secrets - key: MINIO_DEBUG_ACCESS_KEY + name: minio-access-secret + key: MINIO_ACCESS_KEY - name: MINIO_ACCESS_SECRET valueFrom: secretKeyRef: - name: mcserver--common--config-secrets - key: MINIO_DEBUG_ACCESS_SECRET + name: minio-access-secret + key: MINIO_ACCESS_SECRET - name: BUCKET_NAME value: seichi-plugins - name: BUCKET_PREFIX_NAME diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf index 8329add98..25dc63bbb 100644 --- a/terraform/onp_cluster_minecraft_secrets.tf +++ b/terraform/onp_cluster_minecraft_secrets.tf @@ -7,9 +7,7 @@ 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 + DISCORDSRV_TOKEN = var.minecraft__discordsrv_bot_token } type = "Opaque" From a0b2bac181442463471f85d3f6c9c5151b5ccbc7 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sun, 19 Nov 2023 17:49:21 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20name=E3=82=92clustersecret=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/debug-s1/stateful-set.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 60983bcce..f8c61163b 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 @@ -41,12 +41,12 @@ spec: - name: MINIO_ACCESS_KEY valueFrom: secretKeyRef: - name: minio-access-secret + name: clustersecret key: MINIO_ACCESS_KEY - name: MINIO_ACCESS_SECRET valueFrom: secretKeyRef: - name: minio-access-secret + name: clustersecret key: MINIO_ACCESS_SECRET - name: BUCKET_NAME value: seichi-plugins From 7e2bf3c19f70fde30f97b97c5d01d645568b1deb Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 2 Dec 2023 17:29:02 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20minio-secrets=E3=82=92=E5=AE=9A?= =?UTF-8?q?=E7=BE=A9=E3=81=97=E3=81=A6minio-secrets=E3=81=8B=E3=82=89secre?= =?UTF-8?q?t=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/debug-s1/stateful-set.yaml | 4 +-- terraform/onp_cluster_minecraft_secrets.tf | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) 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 f8c61163b..0c61272ac 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 @@ -41,12 +41,12 @@ spec: - name: MINIO_ACCESS_KEY valueFrom: secretKeyRef: - name: clustersecret + name: minio-secrets key: MINIO_ACCESS_KEY - name: MINIO_ACCESS_SECRET valueFrom: secretKeyRef: - name: clustersecret + name: minio-secrets key: MINIO_ACCESS_SECRET - name: BUCKET_NAME value: seichi-plugins diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf index 25dc63bbb..e6f2ac498 100644 --- a/terraform/onp_cluster_minecraft_secrets.tf +++ b/terraform/onp_cluster_minecraft_secrets.tf @@ -114,3 +114,31 @@ resource "kubernetes_secret" "onp_minecraft_debug_mariadb_root_password" { type = "Opaque" } + +resource "helm_release" "onp_minecraft_mariadb_monitoring_password" { + depends_on = [kubernetes_namespace.onp_seichi_debug_minecraft] + + repository = "https://giganticminecraft.github.io/seichi_infra/" + chart = "raw-resources" + name = "seichi-debug-minecraft-minio-secrets" + namespace = "kube-system" + version = "0.3.0" + + set_list { + name = "manifests" + value = [<<-EOS + kind: ClusterSecret + apiVersion: clustersecret.io/v1 + metadata: + namespace: clustersecret + name: minio-secrets + matchNamespace: + - seichi-debug-minecraft-on-seichiassist-pr-* + data: + MINIO_ACCESS_KEY: ${base64encode(var.minio_debug_access_key)} + MINIO_DEBUG_ACCESS_SECRET: ${base64encode(var.minio_debug_access_secret)} + EOS + ] + } + +} From 481be8306faefeef56665ec1a13f4d4fc0268dd9 Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 2 Dec 2023 17:54:37 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20resource=E5=90=8D=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E3=81=88=E5=BF=98=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- terraform/onp_cluster_minecraft_secrets.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf index e6f2ac498..5c5ffcd40 100644 --- a/terraform/onp_cluster_minecraft_secrets.tf +++ b/terraform/onp_cluster_minecraft_secrets.tf @@ -115,7 +115,7 @@ resource "kubernetes_secret" "onp_minecraft_debug_mariadb_root_password" { type = "Opaque" } -resource "helm_release" "onp_minecraft_mariadb_monitoring_password" { +resource "helm_release" "onp_minecraft_debug_minio_secrets" { depends_on = [kubernetes_namespace.onp_seichi_debug_minecraft] repository = "https://giganticminecraft.github.io/seichi_infra/" From 5bbe767e2030f9ffa742e1442f4a5ec338a57eca Mon Sep 17 00:00:00 2001 From: rito528 <39003544+rito528@users.noreply.github.com> Date: Sat, 9 Dec 2023 00:57:41 +0900 Subject: [PATCH 5/5] =?UTF-8?q?style:=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- terraform/onp_cluster_minecraft_secrets.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/onp_cluster_minecraft_secrets.tf b/terraform/onp_cluster_minecraft_secrets.tf index 5c5ffcd40..0a907d729 100644 --- a/terraform/onp_cluster_minecraft_secrets.tf +++ b/terraform/onp_cluster_minecraft_secrets.tf @@ -115,7 +115,7 @@ resource "kubernetes_secret" "onp_minecraft_debug_mariadb_root_password" { type = "Opaque" } -resource "helm_release" "onp_minecraft_debug_minio_secrets" { +resource "helm_release" "onp_minecraft_debug_minio_secrets" { depends_on = [kubernetes_namespace.onp_seichi_debug_minecraft] repository = "https://giganticminecraft.github.io/seichi_infra/"