Merge pull request #1352 from GiganticMinecraft/add_db_password_on_pr…

…_review add root password
GiganticMinecraft · Oct 2, 2023 · c34fc7f · c34fc7f
2 parents 5bfb4d7 + fb95339
commit c34fc7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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,7 +4,7 @@ metadata:
   name: mariadb
 spec:
   rootPasswordSecretKeyRef:
-    name: mariadb
+    name: mariadb-pr-review-password
     key: root-password
 
   database: seichiassist

diff --git a/terraform/onp_cluster_secrets.tf b/terraform/onp_cluster_secrets.tf
@@ -197,6 +197,11 @@ 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のパスワードがぶっ壊れて困るので記号を含めない
@@ -222,6 +227,7 @@ resource "helm_release" "onp_minecraft__pr_review_mariadb_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
     ]