diff --git a/main.tf b/main.tf index 7f0dcd73..25b4dfcf 100644 --- a/main.tf +++ b/main.tf @@ -50,18 +50,7 @@ variable "alertmanager_slack_api_url" {} variable "home_assistant_configuration" {} variable "shadowsocks_password" {} variable "finance_app_db_connection_string" {} -variable "finance_app_monzo_client_id" {} -variable "finance_app_monzo_client_secret" {} -variable "finance_app_sqlite_db_path" {} -variable "finance_app_imap_host" {} -variable "finance_app_imap_user" {} -variable "finance_app_imap_password" {} -variable "finance_app_imap_directory" {} -variable "finance_app_oauth_google_client_id" {} -variable "finance_app_oauth_google_client_secret" {} variable "finance_app_graphql_api_secret" {} -variable "finance_app_gocardless_secret_id" {} -variable "finance_app_gocardless_secret_key" {} variable "headscale_config" {} variable "ansible_prefix" { @@ -278,19 +267,8 @@ module "kubernetes_cluster" { shadowsocks_password = var.shadowsocks_password # finance app - finance_app_monzo_client_id = var.finance_app_monzo_client_id - finance_app_monzo_client_secret = var.finance_app_monzo_client_secret - finance_app_sqlite_db_path = var.finance_app_sqlite_db_path - finance_app_imap_host = var.finance_app_imap_host - finance_app_imap_user = var.finance_app_imap_user - finance_app_imap_password = var.finance_app_imap_password - finance_app_imap_directory = var.finance_app_imap_directory - finance_app_oauth_google_client_id = var.finance_app_oauth_google_client_id - finance_app_oauth_google_client_secret = var.finance_app_oauth_google_client_secret - finance_app_graphql_api_secret = var.finance_app_graphql_api_secret - finance_app_db_connection_string = var.finance_app_db_connection_string - finance_app_gocardless_secret_id = var.finance_app_gocardless_secret_id - finance_app_gocardless_secret_key = var.finance_app_gocardless_secret_key + finance_app_graphql_api_secret = var.finance_app_graphql_api_secret + finance_app_db_connection_string = var.finance_app_db_connection_string headscale_config = var.headscale_config } diff --git a/modules/kubernetes/finance_app/main.tf b/modules/kubernetes/finance_app/main.tf index 17450427..54a029e1 100644 --- a/modules/kubernetes/finance_app/main.tf +++ b/modules/kubernetes/finance_app/main.tf @@ -1,21 +1,10 @@ variable "tls_secret_name" {} -variable "monzo_client_id" {} -variable "monzo_client_secret" {} -variable "sqlite_db_path" {} -variable "imap_host" {} -variable "imap_user" {} -variable "imap_password" {} -variable "imap_directory" {} variable "prod_graphql_endpoint" { default = "https://finance.viktorbarzin.me/graphql" } -variable "oauth_google_client_id" {} -variable "oauth_google_client_secret" {} variable "graphql_api_secret" {} variable "db_connection_string" { } -variable "gocardless_secret_id" {} -variable "gocardless_secret_key" {} resource "kubernetes_namespace" "finance_app" { @@ -105,6 +94,10 @@ resource "kubernetes_deployment" "finance_app" { name = "finance-app" image_pull_policy = "Always" + env { + name = "DB_CONNECTION_STRING" + value = var.db_connection_string + } env { name = "GRAPHQL_API_SECRET" value = var.graphql_api_secret diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf index 01f1a249..f3ae005f 100644 --- a/modules/kubernetes/main.tf +++ b/modules/kubernetes/main.tf @@ -37,18 +37,7 @@ variable "alertmanager_slack_api_url" {} variable "home_assistant_configuration" {} variable "shadowsocks_password" {} variable "finance_app_db_connection_string" {} -variable "finance_app_monzo_client_id" {} -variable "finance_app_monzo_client_secret" {} -variable "finance_app_sqlite_db_path" {} -variable "finance_app_imap_host" {} -variable "finance_app_imap_user" {} -variable "finance_app_imap_password" {} -variable "finance_app_imap_directory" {} -variable "finance_app_oauth_google_client_id" {} -variable "finance_app_oauth_google_client_secret" {} variable "finance_app_graphql_api_secret" {} -variable "finance_app_gocardless_secret_id" {} -variable "finance_app_gocardless_secret_key" {} variable "headscale_config" {} resource "null_resource" "core_services" { @@ -264,21 +253,10 @@ module "home_assistant" { } module "finance_app" { - source = "./finance_app" - tls_secret_name = var.tls_secret_name - monzo_client_id = var.finance_app_monzo_client_id - monzo_client_secret = var.finance_app_monzo_client_secret - sqlite_db_path = var.finance_app_sqlite_db_path - imap_host = var.finance_app_imap_host - imap_user = var.finance_app_imap_user - imap_password = var.finance_app_imap_password - imap_directory = var.finance_app_imap_directory - oauth_google_client_id = var.finance_app_oauth_google_client_id - oauth_google_client_secret = var.finance_app_oauth_google_client_secret - graphql_api_secret = var.finance_app_graphql_api_secret - db_connection_string = var.finance_app_db_connection_string - gocardless_secret_id = var.finance_app_gocardless_secret_id - gocardless_secret_key = var.finance_app_gocardless_secret_key + source = "./finance_app" + tls_secret_name = var.tls_secret_name + graphql_api_secret = var.finance_app_graphql_api_secret + db_connection_string = var.finance_app_db_connection_string } module "excalidraw" { diff --git a/terraform.tfstate b/terraform.tfstate index 682ce369..623e9d5d 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ diff --git a/terraform.tfvars b/terraform.tfvars index 8c287df6..f03e7df6 100644 Binary files a/terraform.tfvars and b/terraform.tfvars differ