Skip to content

Commit 0139b7a

Browse files
authored
Merge branch 'main' into release-please--branches--main
2 parents 0ff82b8 + 2ffa84b commit 0139b7a

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

infra/main.tf

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ resource "google_secret_manager_secret_iam_binding" "nextauth_secret" {
106106
}
107107

108108
### Cloud Run service resources and network endpoint group ###
109-
109+
#### Service Account
110110
resource "google_service_account" "cloud_run" {
111111
project = var.project_id
112-
account_id = "sa-run"
113-
display_name = "Service account for ${var.deployment_name} Cloud Run service."
112+
account_id = "cloud-run-service-account"
113+
display_name = "${var.deployment_name} Cloud Run service Service Account."
114114
}
115115

116+
#### Cloud Run IAM
116117
resource "google_project_iam_member" "run_datastore_owner" {
117118
project = var.project_id
118119
role = "roles/datastore.owner"
@@ -145,20 +146,6 @@ resource "google_cloud_run_v2_service" "default" {
145146
name = "NEXTAUTH_URL"
146147
value = local.nextauth_url
147148
}
148-
startup_probe {
149-
initial_delay_seconds = 45
150-
timeout_seconds = 65
151-
period_seconds = 5
152-
failure_threshold = 5
153-
tcp_socket {
154-
port = 8080
155-
}
156-
}
157-
liveness_probe {
158-
http_get {
159-
path = "/"
160-
}
161-
}
162149
}
163150
service_account = google_service_account.cloud_run.email
164151
}

infra/outputs.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
output "frontend_url" {
18-
value = "http://${google_compute_global_address.default.address}/"
18+
description = "IP address to site. Load balancer expected to take ~5 minutes for it to warm up."
19+
value = "http://${google_compute_global_address.default.address}/ (Wait ~5 minutes for it to warm up.)"
1920
}
2021

2122
output "neos_toc_url" {

0 commit comments

Comments
 (0)