diff --git a/modules/cloud-run-v2/README.md b/modules/cloud-run-v2/README.md index 919370ae1..a08978c5b 100644 --- a/modules/cloud-run-v2/README.md +++ b/modules/cloud-run-v2/README.md @@ -495,11 +495,11 @@ module "cloud_run" { | [labels](variables.tf#L142) | Resource labels. | map(string) | | {} | | [launch_stage](variables.tf#L148) | The launch stage as defined by Google Cloud Platform Launch Stages. | string | | null | | [prefix](variables.tf#L170) | Optional prefix used for resource names. | string | | null | -| [revision](variables.tf#L190) | Revision template configurations. | object({…}) | | {} | -| [service_account](variables.tf#L217) | Service account email. Unused if service account is auto-created. | string | | null | -| [service_account_create](variables.tf#L223) | Auto-create service account. | bool | | false | -| [tag_bindings](variables.tf#L229) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | -| [volumes](variables.tf#L236) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | +| [revision](variables.tf#L190) | Revision template configurations. | object({…}) | | {} | +| [service_account](variables.tf#L221) | Service account email. Unused if service account is auto-created. | string | | null | +| [service_account_create](variables.tf#L227) | Auto-create service account. | bool | | false | +| [tag_bindings](variables.tf#L233) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | +| [volumes](variables.tf#L240) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | | [vpc_connector_create](variables-vpcconnector.tf#L17) | Populate this to create a Serverless VPC Access connector. | object({…}) | | null | ## Outputs diff --git a/modules/cloud-run-v2/job.tf b/modules/cloud-run-v2/job.tf index 06d28bb4b..e42ae495a 100644 --- a/modules/cloud-run-v2/job.tf +++ b/modules/cloud-run-v2/job.tf @@ -24,6 +24,7 @@ resource "google_cloud_run_v2_job" "job" { launch_stage = var.launch_stage deletion_protection = var.deletion_protection template { + task_count = var.revision.job.task_count template { encryption_key = var.encryption_key dynamic "vpc_access" { @@ -43,6 +44,7 @@ resource "google_cloud_run_v2_job" "job" { } } } + max_retries = var.revision.job.max_retries timeout = var.revision.timeout service_account = local.service_account_email dynamic "containers" { diff --git a/modules/cloud-run-v2/variables.tf b/modules/cloud-run-v2/variables.tf index a5cb55504..459411b78 100644 --- a/modules/cloud-run-v2/variables.tf +++ b/modules/cloud-run-v2/variables.tf @@ -195,6 +195,10 @@ variable "revision" { max_concurrency = optional(number) max_instance_count = optional(number) min_instance_count = optional(number) + job = optional(object({ + max_retries = optional(number) + task_count = optional(number) + }), {}) vpc_access = optional(object({ connector = optional(string) egress = optional(string)