Add SENTRY_DSN secrets to matchmaker and server

vladbat00 · Nov 21, 2021 · 021ee55 · 021ee55
1 parent 177a17e
commit 021ee55
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/k8s/agones/mr_server_fleet.tf b/k8s/agones/mr_server_fleet.tf
@@ -111,6 +111,17 @@ resource "kubernetes_manifest" "mr_server_fleet" {
                       cpu    = "500m"
                     }
                   }
+                  env = [
+                    {
+                      name = "SENTRY_DSN"
+                      valueFrom = {
+                        secretKeyRef = {
+                          name = "sentry-dsn"
+                          key  = "server"
+                        }
+                      }
+                    }
+                  ]
                 }
               ]
             }

diff --git a/k8s/matchmaker/module.tf b/k8s/matchmaker/module.tf
@@ -34,6 +34,15 @@ resource "kubernetes_deployment" "mr_matchmaker" {
             name           = "webhook"
             container_port = 8081
           }
+          env {
+            name = "SENTRY_DSN"
+            value_from {
+              secret_key_ref {
+                name = "sentry-dsn"
+                key  = "matchmaker"
+              }
+            }
+          }
         }
       }
     }

diff --git a/module.tf b/module.tf
@@ -63,6 +63,18 @@ variable "record_name" {
   default = ""
 }
 
+variable "sentry_dsn_server" {
+  type      = string
+  default   = ""
+  sensitive = true
+}
+
+variable "sentry_dsn_matchmaker" {
+  type      = string
+  default   = ""
+  sensitive = true
+}
+
 provider "aws" {
   profile = "default"
   region  = var.region
@@ -100,6 +112,16 @@ provider "kubernetes" {
   }
 }
 
+resource "kubernetes_secret" "sentry_dsn" {
+  metadata {
+    name = "sentry-dsn"
+  }
+  data = {
+    server     = var.sentry_dsn_server
+    matchmaker = var.sentry_dsn_matchmaker
+  }
+}
+
 variable "log_level" {
   default = "info"
 }
@@ -125,7 +147,7 @@ module "aws_autoscaler" {
 
 module "matchmaker" {
   source     = "./k8s/matchmaker"
-  depends_on = [module.aws_load_balancer_controller, module.helm_agones]
+  depends_on = [module.aws_load_balancer_controller, module.helm_agones, kubernetes_secret.sentry_dsn]
 }
 
 module "web_client" {
@@ -150,7 +172,7 @@ module "route53" {
 # Comment this out if running for the first time (i.e. when `helm_agones` is not installed).
 module "agones" {
   source     = "./k8s/agones"
-  depends_on = [module.eks_cluster, module.helm_agones]
+  depends_on = [module.eks_cluster, module.helm_agones, kubernetes_secret.sentry_dsn]
 }
 
 // Next Helm module cause "terraform destroy" timeout, unless helm release would be deleted first.