From 10a9eeb808bc70bfa9ac347681601bdb884e2a71 Mon Sep 17 00:00:00 2001 From: Viktor Barzin Date: Fri, 24 Nov 2023 17:38:49 +0000 Subject: [PATCH] add postgresql to dbaas [ci skip] --- main.tf | 11 ++++++++++- modules/kubernetes/main.tf | 22 ++++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 6f006d07..f3b97f5d 100644 --- a/main.tf +++ b/main.tf @@ -28,6 +28,8 @@ variable "bind_named_conf_options" {} variable "alertmanager_account_password" {} variable "wireguard_wg_0_key" {} variable "dbaas_root_password" {} +variable "dbaas_postgresql_root_password" {} +variable "dbaas_pgadmin_password" {} variable "drone_github_client_id" {} variable "drone_github_client_secret" {} variable "drone_rpc_secret" {} @@ -58,6 +60,8 @@ variable "headscale_config" {} variable "immich_postgresql_password" {} variable "ingress_honeypotapikey" {} variable "vaultwarden_smtp_password" {} +variable "resume_database_url" {} +variable "resume_redis_url" {} variable "ansible_prefix" { default = "ANSIBLE_VAULT_PASSWORD_FILE=~/.ansible/vault_pass.txt ansible-playbook -i playbook/hosts.yaml playbook/linux.yml -t linux/initial_setup" @@ -264,7 +268,9 @@ module "kubernetes_cluster" { url_shortener_mysql_password = var.url_shortener_mysql_password # dbaas - dbaas_root_password = var.dbaas_root_password + dbaas_root_password = var.dbaas_root_password + dbaas_postgresql_root_password = var.dbaas_postgresql_root_password + dbaas_pgadmin_password = var.dbaas_pgadmin_password # home-assistant home_assistant_configuration = var.home_assistant_configuration @@ -286,6 +292,9 @@ module "kubernetes_cluster" { ingress_honeypotapikey = var.ingress_honeypotapikey vaultwarden_smtp_password = var.vaultwarden_smtp_password + + resume_redis_url = var.resume_redis_url + resume_database_url = var.resume_database_url } diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf index ff07a588..4cc99f90 100644 --- a/modules/kubernetes/main.tf +++ b/modules/kubernetes/main.tf @@ -16,6 +16,8 @@ variable "bind_db_viktorbarzin_lan" {} variable "bind_named_conf_options" {} variable "alertmanager_account_password" {} variable "dbaas_root_password" {} +variable "dbaas_postgresql_root_password" {} +variable "dbaas_pgadmin_password" {} variable "drone_github_client_id" {} variable "drone_github_client_secret" {} variable "drone_rpc_secret" {} @@ -45,6 +47,8 @@ variable "headscale_config" {} variable "immich_postgresql_password" {} variable "ingress_honeypotapikey" {} variable "vaultwarden_smtp_password" {} +variable "resume_database_url" {} +variable "resume_redis_url" {} resource "null_resource" "core_services" { # List all the core modules that must be provisioned first @@ -67,10 +71,12 @@ module "blog" { # } module "dbaas" { - source = "./dbaas" - prod = var.prod - tls_secret_name = var.tls_secret_name - dbaas_root_password = var.dbaas_root_password + source = "./dbaas" + prod = var.prod + tls_secret_name = var.tls_secret_name + dbaas_root_password = var.dbaas_root_password + postgresql_root_password = var.dbaas_postgresql_root_password + pgadmin_password = var.dbaas_pgadmin_password } module "descheduler" { @@ -352,3 +358,11 @@ module "crowdsec" { source = "./crowdsec" tls_secret_name = var.tls_secret_name } + +# Seems like it needs S3 even if pg is local... +# module "resume" { +# source = "./resume" +# tls_secret_name = var.tls_secret_name +# redis_url = var.resume_redis_url +# database_url = var.resume_database_url +# }