Merge branch 'main' into githubactions

GoogleCloudPlatform · Mar 6, 2024 · 533b376 · 533b376
2 parents 9c19454 + 13be33c
commit 533b376
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/applications/rag/main.tf b/applications/rag/main.tf
@@ -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

diff --git 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
-}
+}
+
+output "instance" {
+  description = "Cloud SQL Instance name"
+  value       = google_sql_database_instance.main.name
+}