Merge branch 'main' of github.com:GiganticMinecraft/seichi_infra into…

… main
GiganticMinecraft · Oct 9, 2023 · 373e2be · 373e2be
2 parents b056c49 + fdfe1c1
commit 373e2be
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 9 deletions.
diff --git a/...-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml b/...-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/debug-s1/stateful-set.yaml
@@ -92,7 +92,7 @@ spec:
             - name: CFG_DISCORDSRV_CONSOLE_CHANNEL_ID
               value: "1054159676964622426"
 
-          image: itzg/minecraft-server:2023.9.1-java8-jdk
+          image: itzg/minecraft-server:2023.10.1-java8-jdk
           name: minecraft
           ports:
             - containerPort: 25565

diff --git a/...netes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/dummy-secret.yaml b/...netes/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/dummy-secret.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mcserver--common--config-secrets
+data:
+  # 複数の PR があるときに DiscordSRV がどのような挙動をすべきかがまだ明確ではない。
+  #
+  # 理想では、Discord のチャンネルを PR 毎に生やしてくれて chat channel id と console channel id を
+  # configmap 等に吐き出してくれる controller が居てくれれば良いが、2023/10/07現在、そのようなものは実装されていない。
+  #
+  # この DISCORDSRV_TOKEN はデバッグ環境の bot の token を入れれば良いかもしれないが、
+  # とりあえず DiscordSRV の動作を止めるために空文字列を入れておくことにする
+  DISCORDSRV_TOKEN: ""
diff --git a/...es/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/mariadb.yaml b/...es/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/mariadb.yaml
@@ -4,13 +4,13 @@ metadata:
   name: mariadb
 spec:
   rootPasswordSecretKeyRef:
-    name: mariadb
+    name: mariadb-pr-review-password
     key: root-password
 
   database: seichiassist
   username: mcserver
   passwordSecretKeyRef:
-    name: mariadb
+    name: mariadb-pr-review-password
     key: mcserver-password
 
   image:

diff --git a/.../seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-snmp-exporter.yaml b/.../seichi-kubernetes/apps/cluster-wide-apps/app-of-other-apps/prometheus-snmp-exporter.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     chart: prometheus-snmp-exporter
     repoURL: https://prometheus-community.github.io/helm-charts
-    targetRevision: 1.8.0
+    targetRevision: 1.8.1
     helm:
       releaseName: prometheus-snmp-exporter
       # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-snmp-exporter/values.yaml

diff --git a/...nifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml b/...nifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     chart: redis
     repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 18.1.1
+    targetRevision: 18.1.2
     helm:
       releaseName: seichi-debug-bungeesemaphore-redis
       values: |

diff --git a/...s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml b/...s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     chart: redis
     repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 18.1.1
+    targetRevision: 18.1.2
     helm:
       releaseName: seichi-debug-redisbungee-redis
       values: |

diff --git a/...ifests/seichi-kubernetes/apps/seichi-debug-minecraft/mcserver--debug-s1/stateful-set.yaml b/...ifests/seichi-kubernetes/apps/seichi-debug-minecraft/mcserver--debug-s1/stateful-set.yaml
@@ -92,7 +92,7 @@ spec:
             - name: CFG_DISCORDSRV_CONSOLE_CHANNEL_ID
               value: "1054159676964622426"
 
-          image: itzg/minecraft-server:2023.9.1-java8-jdk
+          image: itzg/minecraft-server:2023.10.1-java8-jdk
           name: minecraft
           ports:
             - containerPort: 25565

diff --git a/...np-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml b/...np-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     chart: redis
     repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 18.1.1
+    targetRevision: 18.1.2
     helm:
       releaseName: seichi-bungeesemaphore-redis
       values: |

diff --git a/...hi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml b/...hi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml
@@ -8,7 +8,7 @@ spec:
   source:
     chart: redis
     repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 18.1.1
+    targetRevision: 18.1.2
     helm:
       releaseName: seichi-redisbungee-redis
       values: |

diff --git a/terraform/onp_cluster_secrets.tf b/terraform/onp_cluster_secrets.tf
@@ -196,3 +196,40 @@ resource "helm_release" "onp_minecraft_mariadb_monitoring_password" {
     ]
   }
 }
+
+resource "random_password" "minecraft__pr_review_mariadb_root_password" {
+  length  = 16
+  special = false // MariaDBのパスワードがぶっ壊れて困るので記号を含めない
+}
+
+resource "random_password" "minecraft__pr_review_mariadb_password" {
+  length  = 16
+  special = false // MariaDBのパスワードがぶっ壊れて困るので記号を含めない
+}
+
+resource "helm_release" "onp_minecraft__pr_review_mariadb_password" {
+  depends_on = [helm_release.onp_cluster_clustersecret]
+
+  repository = "https://giganticminecraft.github.io/seichi_infra/"
+  chart      = "raw-resources"
+  name       = "mariadb-pr-review-password-raw-resource"
+  namespace  = "kube-system"
+  version    = "0.3.0"
+
+  set_list {
+    name = "manifests"
+    value = [<<-EOS
+      kind: ClusterSecret
+      apiVersion: clustersecret.io/v1
+      metadata:
+        namespace: clustersecret
+        name: mariadb-pr-review-password
+      matchNamespace:
+        - seichi-debug-minecraft-on-seichiassist-pr-*
+      data:
+        root-password: ${base64encode(random_password.minecraft__pr_review_mariadb_root_password.result)}
+        mcserver-password: ${base64encode(random_password.minecraft__pr_review_mariadb_password.result)}
+    EOS
+    ]
+  }
+}