commit 2732a5ccb169defd4e696a400ab9b9eb173865ae
author Jonathan Amsterdam <jba@google.com> Wed Dec 15 04:24:20 2021 -0500
committer Jonathan Amsterdam <jba@google.com> Wed Dec 15 16:05:08 2021 +0000
tree 20a66374e754b7ef08e04dbb16abf95f5891e17c
parent 4ce6bdd19e607a85fb6a168b9fc5d1ba9692637f

terraform: increase timeout

Increase the Cloud Run request timeout to its maximum
of 60 minutes.

Also add user-image annotation to avoid spurious tf diffs.

Change-Id: I18008d78f486261b28539790f9a29ceb780a846e
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/372177
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Julie Qiu <julie@golang.org>

terraform/environment/worker.tf

diff --git a/terraform/environment/worker.tf b/terraform/environment/worker.tf
index f18bc32..f2092ab 100644
--- a/terraform/environment/worker.tf
+++ b/terraform/environment/worker.tf
@@ -96,12 +96,15 @@
       }
 
       service_account_name = "frontend@${var.project}.iam.gserviceaccount.com"
+      # 60 minutes is the maximum Cloud Run request time.
+      timeout_seconds = 60 * 60
     }
 
     metadata {
       annotations = {
         "autoscaling.knative.dev/minScale"  = var.min_frontend_instances
         "autoscaling.knative.dev/maxScale"  = "1"
+	"client.knative.dev/user-image"     = data.google_cloud_run_service.worker.template[0].spec[0].containers[0].image
       }
     }
   }

terraform/main.tf

diff --git a/terraform/main.tf b/terraform/main.tf
index d8c13ab..386d1bb 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -54,14 +54,14 @@
   client_secret          = ""
 }
 
-module "prod" {
-  source                 = "./environment"
-  env                    = "prod"
-  project                = "golang-org"
-  region                 = local.region
-  use_profiler           = true
-  min_frontend_instances = 1
-  client_id              = "unknown"
-  client_secret          = var.prod_client_secret
-}
+# module "prod" {
+#   source                 = "./environment"
+#   env                    = "prod"
+#   project                = "golang-org"
+#   region                 = local.region
+#   use_profiler           = true
+#   min_frontend_instances = 1
+#   client_id              = "unknown"
+#   client_secret          = var.prod_client_secret
+# }