diff --git a/main.tf b/main.tf index 3c307eb5..73da04a9 100644 --- a/main.tf +++ b/main.tf @@ -71,6 +71,7 @@ variable "resume_redis_url" {} variable "frigate_valchedrym_camera_credentials" { default = "" } variable "paperless_db_password" {} variable "diun_nfty_token" {} +variable "diun_slack_url" {} variable "docker_config" {} variable "nextcloud_db_password" {} variable "homepage_credentials" { @@ -377,7 +378,7 @@ module "kubernetes_cluster" { paperless_db_password = var.paperless_db_password diun_nfty_token = var.diun_nfty_token - docker_config = var.docker_config + diun_slack_url = var.diun_slack_url nextcloud_db_password = var.nextcloud_db_password homepage_credentials = var.homepage_credentials diff --git a/modules/kubernetes/diun/main.tf b/modules/kubernetes/diun/main.tf index 33244815..04b690b4 100644 --- a/modules/kubernetes/diun/main.tf +++ b/modules/kubernetes/diun/main.tf @@ -1,6 +1,6 @@ variable "tls_secret_name" {} variable "diun_nfty_token" {} -variable "docker_config" {} +variable "diun_slack_url" {} resource "kubernetes_namespace" "diun" { metadata { @@ -17,24 +17,6 @@ module "tls_secret" { tls_secret_name = var.tls_secret_name } -resource "kubernetes_config_map" "docker-config" { - metadata { - name = "docker-config" - namespace = "diun" - - labels = { - app = "diun" - } - annotations = { - "reloader.stakater.com/match" = "true" - } - } - - data = { - "config.json" = var.docker_config - } -} - resource "kubernetes_service_account" "diun" { metadata { name = "diun" @@ -122,41 +104,34 @@ resource "kubernetes_deployment" "diun" { } // ntfy settings - env { - name = "DIUN_NOTIF_NTFY_ENDPOINT" - value = "https://ntfy.viktorbarzin.me" - } + # env { // disabled as if this fails, no other notifications are sent + # name = "DIUN_NOTIF_NTFY_ENDPOINT" + # value = "https://ntfy.viktorbarzin.me" + # } env { name = "DIUN_NOTIF_NTFY_TOPIC" value = "diun-updates" } + # env { + # name = "DIUN_NOTIF_NTFY_TOKEN" + # value = var.diun_nfty_token + # } env { - name = "DIUN_NOTIF_NTFY_TOKEN" - value = var.diun_nfty_token + name = "DIUN_NOTIF_SLACK_WEBHOOKURL" + value = var.diun_slack_url } env { name = "LOG_LEVEL" - value = "debug" + value = "info" + } + env { + name = "DIUN_WATCH_FIRSTCHECKNOTIF" + value = "true" } # env { - # name = "DIUN_WATCH_FIRSTCHECKNOTIF" - # value = "true" + # name = "DIUN_NOTIF_NTFY_TIMEOUT" + # value = "10s" # } - env { - name = "DIUN_NOTIF_NTFY_TIMEOUT" - value = "10s" - } - volume_mount { - name = "docker-config" - mount_path = "/root/.docker/config.json" - sub_path = "config.json" - } - } - volume { - name = "docker-config" - config_map { - name = "docker-config" - } } } } diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf index 1ddac145..ccd81fd4 100644 --- a/modules/kubernetes/main.tf +++ b/modules/kubernetes/main.tf @@ -58,7 +58,7 @@ variable "resume_redis_url" {} variable "frigate_valchedrym_camera_credentials" { default = "" } variable "paperless_db_password" {} variable "diun_nfty_token" {} -variable "docker_config" {} +variable "diun_slack_url" {} variable "nextcloud_db_password" {} variable "homepage_credentials" {} variable "authentik_secret_key" {} @@ -509,7 +509,7 @@ module "diun" { source = "./diun" tls_secret_name = var.tls_secret_name diun_nfty_token = var.diun_nfty_token - docker_config = var.docker_config + diun_slack_url = var.diun_slack_url } module "meshcentral" { diff --git a/terraform.tfstate b/terraform.tfstate index 8b309abf..d3b7d35a 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ diff --git a/terraform.tfvars b/terraform.tfvars index f3c6d02f..07a08587 100644 Binary files a/terraform.tfvars and b/terraform.tfvars differ