Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Functional examples are included in the
| containers | Container images for the service | <pre>list(object({<br> container_name = optional(string, null)<br> container_image = string<br> working_dir = optional(string, null)<br> depends_on_container = optional(list(string), null)<br> container_args = optional(list(string), null)<br> container_command = optional(list(string), null)<br> env_vars = optional(map(string), {})<br> env_secret_vars = optional(map(object({<br> secret = string<br> version = string<br> })), {})<br> volume_mounts = optional(list(object({<br> name = string<br> mount_path = string<br> })), [])<br> ports = optional(object({<br> name = optional(string, "http1")<br> container_port = optional(number, 8080)<br> }), {})<br> resources = optional(object({<br> limits = optional(object({<br> cpu = optional(string)<br> memory = optional(string)<br> nvidia_gpu = optional(string)<br> }))<br> cpu_idle = optional(bool, true)<br> startup_cpu_boost = optional(bool, false)<br> }), {})<br> startup_probe = optional(object({<br> failure_threshold = optional(number, null)<br> initial_delay_seconds = optional(number, null)<br> timeout_seconds = optional(number, null)<br> period_seconds = optional(number, null)<br> http_get = optional(object({<br> path = optional(string)<br> port = optional(string)<br> http_headers = optional(list(object({<br> name = string<br> value = string<br> })), [])<br> }), null)<br> tcp_socket = optional(object({<br> port = optional(number)<br> }), null)<br> grpc = optional(object({<br> port = optional(number)<br> service = optional(string)<br> }), null)<br> }), null)<br> liveness_probe = optional(object({<br> failure_threshold = optional(number, null)<br> initial_delay_seconds = optional(number, null)<br> timeout_seconds = optional(number, null)<br> period_seconds = optional(number, null)<br> http_get = optional(object({<br> path = optional(string)<br> port = optional(string)<br> http_headers = optional(list(object({<br> name = string<br> value = string<br> })), [])<br> }), null)<br> tcp_socket = optional(object({<br> port = optional(number)<br> }), null)<br> grpc = optional(object({<br> port = optional(number)<br> service = optional(string)<br> }), null)<br> }), null)<br> }))</pre> | n/a | yes |
| create\_service\_account | Create a new service account for cloud run service | `bool` | `true` | no |
| custom\_audiences | One or more custom audiences that you want this service to support. Specify each custom audience as the full URL in a string. [Refer](https://cloud.google.com/run/docs/configuring/custom-audiences) | `list(string)` | `null` | no |
| default\_uri\_disabled | Whether the default Cloud Run service URI should be disabled. | `bool` | `false` | no |
| description | Cloud Run service description. This field currently has a 512-character limit. | `string` | `null` | no |
| enable\_prometheus\_sidecar | Enable Prometheus sidecar in Cloud Run instance. | `bool` | `false` | no |
| encryption\_key | A reference to a customer managed encryption key (CMEK) to use to encrypt this container image. This is optional. | `string` | `null` | no |
Expand Down
13 changes: 7 additions & 6 deletions modules/v2/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,13 @@ resource "google_cloud_run_v2_service" "main" {
}
} // template

annotations = var.service_annotations
client = var.client.name
client_version = var.client.version
ingress = var.ingress
launch_stage = var.launch_stage
custom_audiences = var.custom_audiences
annotations = var.service_annotations
client = var.client.name
client_version = var.client.version
default_uri_disabled = var.default_uri_disabled
ingress = var.ingress
launch_stage = var.launch_stage
custom_audiences = var.custom_audiences

dynamic "binary_authorization" {
for_each = var.binary_authorization[*]
Expand Down
4 changes: 4 additions & 0 deletions modules/v2/metadata.display.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ spec:
altDefaults:
- type: ALTERNATE_TYPE_DC
value: false
default_uri_disabled:
name: default_uri_disabled
title: Default URI Disabled
level: 1
containers:
name: containers
title: Containers
Expand Down
4 changes: 4 additions & 0 deletions modules/v2/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,10 @@ spec:
description: Restricts network access to your Cloud Run service
varType: string
defaultValue: INGRESS_TRAFFIC_ALL
- name: default_uri_disabled
description: Whether the default Cloud Run service URI should be disabled.
varType: bool
defaultValue: false
- name: members
description: Users/SAs to be given invoker access to the service. Grant invoker access by specifying the users or service accounts (SAs). Use allUsers for public access, allAuthenticatedUsers for access by logged-in Google users, or provide a list of specific users/SAs. [See the complete list of available options here](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service_iam#member\/members-1)
varType: list(string)
Expand Down
7 changes: 6 additions & 1 deletion modules/v2/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ variable "ingress" {
}
}

variable "default_uri_disabled" {
type = bool
description = "Whether the default Cloud Run service URI should be disabled."
default = false
}

variable "members" {
type = list(string)
description = "Users/SAs to be given invoker access to the service. Grant invoker access by specifying the users or service accounts (SAs). Use allUsers for public access, allAuthenticatedUsers for access by logged-in Google users, or provide a list of specific users/SAs. [See the complete list of available options here](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service_iam#member\\/members-1)"
Expand Down Expand Up @@ -356,4 +362,3 @@ variable "execution_environment" {
error_message = "Allowed values for ingress are \"EXECUTION_ENVIRONMENT_GEN1\", \"EXECUTION_ENVIRONMENT_GEN2\"."
}
}