chore: remove kubemonkey from services (#105)

* chore: remove kubemonkey from services * chore: run make fmt
GaloyMoney · Nov 17, 2022 · e068740 · e068740
1 parent 96c1c66
commit e068740
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 85 deletions.
diff --git a/examples/gcp/services/main.tf b/examples/gcp/services/main.tf
@@ -31,12 +31,10 @@ module "services" {
   source = "git::https://github.com/GaloyMoney/galoy-infra.git//modules/services?ref=5aed769"
   # source = "../../../modules/services"
 
-  name_prefix                 = var.name_prefix
-  letsencrypt_issuer_email    = var.letsencrypt_issuer_email
-  cluster_endpoint            = var.cluster_endpoint
-  cluster_ca_cert             = var.cluster_ca_cert
-  small_footprint             = true
-  kubemonkey_enabled          = true
-  honeycomb_api_key           = "dummy"
-  kubemonkey_notification_url = "dummy"
+  name_prefix              = var.name_prefix
+  letsencrypt_issuer_email = var.letsencrypt_issuer_email
+  cluster_endpoint         = var.cluster_endpoint
+  cluster_ca_cert          = var.cluster_ca_cert
+  small_footprint          = true
+  honeycomb_api_key        = "dummy"
 }
diff --git a/modules/services/kubemonkey-values.yml.tmpl b/modules/services/kubemonkey-values.yml.tmpl
diff --git a/modules/services/kubemonkey.tf b/modules/services/kubemonkey.tf
diff --git a/modules/services/variables.tf b/modules/services/variables.tf
@@ -14,11 +14,6 @@ variable "trace_sample_pct" {
   default = 100
 }
 
-variable "kubemonkey_notification_url" {
-  default   = ""
-  sensitive = true
-}
-
 variable "ingress_nginx_version" {
   default = "4.0.18"
 }
@@ -28,43 +23,31 @@ variable "cert_manager_version" {
 variable "letsencrypt_issuer_email" {}
 variable "local_deploy" { default = false }
 variable "small_footprint" { default = false }
-variable "kubemonkey_enabled" { default = false }
-variable "kubemonkey_time_zone" { default = "Etc/UTC" }
 variable "smoketest_cronjob" { default = false }
 
 locals {
-  local_deploy                = var.local_deploy
-  name_prefix                 = var.name_prefix
-  smoketest_namespace         = "${local.name_prefix}-smoketest"
-  otel_namespace              = "${local.name_prefix}-otel"
-  kubemonkey_namespace        = "${local.name_prefix}-kubemonkey"
-  galoy_namespace             = "${local.name_prefix}-galoy"
-  bitcoin_namespace           = "${var.name_prefix}-bitcoin"
-  monitoring_namespace        = "${var.name_prefix}-monitoring"
-  addons_namespace            = "${var.name_prefix}-addons"
-  smoketest_cronjob           = var.smoketest_cronjob
-  smoketest_name              = "smoketest"
-  smoketest_cronjob_name      = "${local.smoketest_name}-cronjob"
-  cluster_endpoint            = var.cluster_endpoint
-  cluster_ca_cert             = var.cluster_ca_cert
-  ingress_namespace           = "${local.name_prefix}-ingress"
-  ingress_nginx_version       = var.ingress_nginx_version
-  cert_manager_version        = var.cert_manager_version
-  letsencrypt_issuer_email    = var.letsencrypt_issuer_email
-  jaeger_host                 = "opentelemetry-collector.${local.otel_namespace}.svc.cluster.local"
-  trace_sample_pct            = var.trace_sample_pct
-  ingress_service_name        = "${var.name_prefix}-ingress"
-  small_footprint             = var.small_footprint
-  honeycomb_api_key           = var.honeycomb_api_key != "" ? var.honeycomb_api_key : jsondecode(var.secrets).honeycomb_api_key
-  kubemonkey_enabled          = var.kubemonkey_enabled
-  kubemonkey_time_zone        = var.kubemonkey_time_zone
-  kubemonkey_notification_url = var.kubemonkey_notification_url != "" ? var.kubemonkey_notification_url : jsondecode(var.secrets).kubemonkey_notification_url
-  kubemonkey_whitelisted_namespaces = [
-    local.galoy_namespace,
-    local.bitcoin_namespace,
-    local.monitoring_namespace,
-    local.addons_namespace,
-  ]
+  local_deploy             = var.local_deploy
+  name_prefix              = var.name_prefix
+  smoketest_namespace      = "${local.name_prefix}-smoketest"
+  otel_namespace           = "${local.name_prefix}-otel"
+  galoy_namespace          = "${local.name_prefix}-galoy"
+  bitcoin_namespace        = "${var.name_prefix}-bitcoin"
+  monitoring_namespace     = "${var.name_prefix}-monitoring"
+  addons_namespace         = "${var.name_prefix}-addons"
+  smoketest_cronjob        = var.smoketest_cronjob
+  smoketest_name           = "smoketest"
+  smoketest_cronjob_name   = "${local.smoketest_name}-cronjob"
+  cluster_endpoint         = var.cluster_endpoint
+  cluster_ca_cert          = var.cluster_ca_cert
+  ingress_namespace        = "${local.name_prefix}-ingress"
+  ingress_nginx_version    = var.ingress_nginx_version
+  cert_manager_version     = var.cert_manager_version
+  letsencrypt_issuer_email = var.letsencrypt_issuer_email
+  jaeger_host              = "opentelemetry-collector.${local.otel_namespace}.svc.cluster.local"
+  trace_sample_pct         = var.trace_sample_pct
+  ingress_service_name     = "${var.name_prefix}-ingress"
+  small_footprint          = var.small_footprint
+  honeycomb_api_key        = var.honeycomb_api_key != "" ? var.honeycomb_api_key : jsondecode(var.secrets).honeycomb_api_key
 }
 
 output "smoketest_kubeconfig" {