diff --git a/applications/rag/main.tf b/applications/rag/main.tf index 017f20a26..63eb89ac4 100644 --- a/applications/rag/main.tf +++ b/applications/rag/main.tf @@ -89,10 +89,10 @@ provider "helm" { } module "namespace" { - source = "../../modules/kubernetes-namespace" - providers = { helm = helm.rag} + source = "../../modules/kubernetes-namespace" + providers = { helm = helm.rag } create_namespace = true - namespace = var.kubernetes_namespace + namespace = var.kubernetes_namespace } module "kuberay-operator" { @@ -115,12 +115,12 @@ module "gcs" { } module "cloudsql" { - source = "../../modules/cloudsql" - providers = { kubernetes = kubernetes.rag } - project_id = var.project_id - instance_name = var.cloudsql_instance - namespace = var.kubernetes_namespace - depends_on = [module.namespace] + source = "../../modules/cloudsql" + providers = { kubernetes = kubernetes.rag } + project_id = var.project_id + instance_name = var.cloudsql_instance + namespace = var.kubernetes_namespace + depends_on = [module.namespace] } module "jupyterhub" { @@ -200,7 +200,7 @@ module "frontend" { google_service_account = var.rag_service_account namespace = var.kubernetes_namespace inference_service_endpoint = module.inference-server.inference_service_endpoint - cloudsql_instance = var.cloudsql_instance + cloudsql_instance = module.cloudsql.instance db_secret_name = module.cloudsql.db_secret_name db_secret_namespace = module.cloudsql.db_secret_namespace dataset_embeddings_table_name = var.dataset_embeddings_table_name @@ -220,5 +220,5 @@ module "frontend" { url_domain_addr = var.frontend_url_domain_addr url_domain_name = var.frontend_url_domain_name members_allowlist = var.frontend_members_allowlist - depends_on = [ module.namespace ] + depends_on = [module.namespace] } diff --git a/modules/cloudsql/outputs.tf b/modules/cloudsql/outputs.tf index f4010b142..cd8e2d1fb 100644 --- a/modules/cloudsql/outputs.tf +++ b/modules/cloudsql/outputs.tf @@ -20,4 +20,9 @@ output "db_secret_name" { output "db_secret_namespace" { description = "Cloud SQL DB secret namespace" value = kubernetes_secret.secret.metadata[0].namespace -} \ No newline at end of file +} + +output "instance" { + description = "Cloud SQL Instance name" + value = google_sql_database_instance.main.name +}