|
|
|
|
@ -9,6 +9,7 @@ Cloud Run management, with support for IAM roles, revision annotations and optio
|
|
|
|
|
- [IAM and environment variables](#iam-and-environment-variables)
|
|
|
|
|
- [Mounting secrets as volumes](#mounting-secrets-as-volumes)
|
|
|
|
|
- [Revision annotations](#revision-annotations)
|
|
|
|
|
- [Second generation execution environment](#second-generation-execution-environment)
|
|
|
|
|
- [VPC Access Connector creation](#vpc-access-connector-creation)
|
|
|
|
|
- [Traffic split](#traffic-split)
|
|
|
|
|
- [Eventarc triggers](#eventarc-triggers)
|
|
|
|
|
@ -107,6 +108,25 @@ module "cloud_run" {
|
|
|
|
|
# tftest modules=1 resources=1 inventory=revision-annotations.yaml
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
### Second generation execution environment
|
|
|
|
|
|
|
|
|
|
Second generation execution environment (gen2) can be enabled by setting the `gen2_execution_environment` variable to true:
|
|
|
|
|
|
|
|
|
|
```hcl
|
|
|
|
|
module "cloud_run" {
|
|
|
|
|
source = "./fabric/modules/cloud-run"
|
|
|
|
|
project_id = var.project_id
|
|
|
|
|
name = "hello"
|
|
|
|
|
containers = {
|
|
|
|
|
hello = {
|
|
|
|
|
image = "us-docker.pkg.dev/cloudrun/container/hello"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
gen2_execution_environment = true
|
|
|
|
|
}
|
|
|
|
|
# tftest modules=1 resources=1 inventory=gen2.yaml
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
### VPC Access Connector creation
|
|
|
|
|
|
|
|
|
|
If creation of a [VPC Access Connector](https://cloud.google.com/vpc/docs/serverless-vpc-access) is required, use the `vpc_connector_create` variable which also support optional attributes for number of instances, machine type, and throughput (not shown here). The annotation to use the connector will be added automatically.
|
|
|
|
|
@ -313,29 +333,29 @@ module "cloud_run" {
|
|
|
|
|
# tftest modules=1 resources=1 inventory=service-account-external.yaml
|
|
|
|
|
```
|
|
|
|
|
<!-- BEGIN TFDOC -->
|
|
|
|
|
|
|
|
|
|
## Variables
|
|
|
|
|
|
|
|
|
|
| name | description | type | required | default |
|
|
|
|
|
|---|---|:---:|:---:|:---:|
|
|
|
|
|
| [name](variables.tf#L130) | Name used for cloud run service. | <code>string</code> | ✓ | |
|
|
|
|
|
| [project_id](variables.tf#L145) | Project id used for all resources. | <code>string</code> | ✓ | |
|
|
|
|
|
| [name](variables.tf#L136) | Name used for cloud run service. | <code>string</code> | ✓ | |
|
|
|
|
|
| [project_id](variables.tf#L151) | Project id used for all resources. | <code>string</code> | ✓ | |
|
|
|
|
|
| [container_concurrency](variables.tf#L18) | Maximum allowed in-flight (concurrent) requests per container of the revision. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [containers](variables.tf#L24) | Containers in arbitrary key => attributes format. | <code title="map(object({ image = string args = optional(list(string)) command = optional(list(string)) env = optional(map(string), {}) env_from_key = optional(map(object({ key = string name = string })), {}) liveness_probe = optional(object({ action = object({ grcp = optional(object({ port = optional(number) service = optional(string) })) http_get = optional(object({ http_headers = optional(map(string), {}) path = optional(string) })) }) failure_threshold = optional(number) initial_delay_seconds = optional(number) period_seconds = optional(number) timeout_seconds = optional(number) })) ports = optional(map(object({ container_port = optional(number) name = optional(string) protocol = optional(string) })), {}) resources = optional(object({ limits = optional(object({ cpu = string memory = string })) requests = optional(object({ cpu = string memory = string })) })) startup_probe = optional(object({ action = object({ grcp = optional(object({ port = optional(number) service = optional(string) })) http_get = optional(object({ http_headers = optional(map(string), {}) path = optional(string) })) tcp_socket = optional(object({ port = optional(number) })) }) failure_threshold = optional(number) initial_delay_seconds = optional(number) period_seconds = optional(number) timeout_seconds = optional(number) })) volume_mounts = optional(map(string), {}) }))">map(object({…}))</code> | | <code>{}</code> |
|
|
|
|
|
| [eventarc_triggers](variables.tf#L91) | Event arc triggers for different sources. | <code title="object({ audit_log = optional(map(object({ method = string service = string })), {}) pubsub = optional(map(string), {}) service_account_email = optional(string) service_account_create = optional(bool, false) })">object({…})</code> | | <code>{}</code> |
|
|
|
|
|
| [iam](variables.tf#L105) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | <code>map(list(string))</code> | | <code>{}</code> |
|
|
|
|
|
| [ingress_settings](variables.tf#L111) | Ingress settings. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [labels](variables.tf#L124) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
|
|
|
|
| [prefix](variables.tf#L135) | Optional prefix used for resource names. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [region](variables.tf#L150) | Region used for all resources. | <code>string</code> | | <code>"europe-west1"</code> |
|
|
|
|
|
| [revision_annotations](variables.tf#L156) | Configure revision template annotations. | <code title="object({ autoscaling = optional(object({ max_scale = number min_scale = number })) cloudsql_instances = optional(list(string), []) vpcaccess_connector = optional(string) vpcaccess_egress = optional(string) })">object({…})</code> | | <code>{}</code> |
|
|
|
|
|
| [revision_name](variables.tf#L171) | Revision name. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [service_account](variables.tf#L177) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [service_account_create](variables.tf#L183) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
|
|
|
|
| [timeout_seconds](variables.tf#L189) | Maximum duration the instance is allowed for responding to a request. | <code>number</code> | | <code>null</code> |
|
|
|
|
|
| [traffic](variables.tf#L195) | Traffic steering configuration. If revision name is null the latest revision will be used. | <code title="map(object({ percent = number latest = optional(bool) tag = optional(string) }))">map(object({…}))</code> | | <code>{}</code> |
|
|
|
|
|
| [volumes](variables.tf#L206) | Named volumes in containers in name => attributes format. | <code title="map(object({ secret_name = string default_mode = optional(string) items = optional(map(object({ path = string mode = optional(string) }))) }))">map(object({…}))</code> | | <code>{}</code> |
|
|
|
|
|
| [vpc_connector_create](variables.tf#L220) | Populate this to create a VPC connector. You can then refer to it in the template annotations. | <code title="object({ ip_cidr_range = optional(string) vpc_self_link = optional(string) machine_type = optional(string) name = optional(string) instances = optional(object({ max = optional(number) min = optional(number) }), {}) throughput = optional(object({ max = optional(number) min = optional(number) }), {}) subnet = optional(object({ name = optional(string) project_id = optional(string) }), {}) })">object({…})</code> | | <code>null</code> |
|
|
|
|
|
| [gen2_execution_environment](variables.tf#L105) | Use second generation execution environment. | <code>bool</code> | | <code>false</code> |
|
|
|
|
|
| [iam](variables.tf#L111) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | <code>map(list(string))</code> | | <code>{}</code> |
|
|
|
|
|
| [ingress_settings](variables.tf#L117) | Ingress settings. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [labels](variables.tf#L130) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
|
|
|
|
| [prefix](variables.tf#L141) | Optional prefix used for resource names. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [region](variables.tf#L156) | Region used for all resources. | <code>string</code> | | <code>"europe-west1"</code> |
|
|
|
|
|
| [revision_annotations](variables.tf#L162) | Configure revision template annotations. | <code title="object({ autoscaling = optional(object({ max_scale = number min_scale = number })) cloudsql_instances = optional(list(string), []) vpcaccess_connector = optional(string) vpcaccess_egress = optional(string) })">object({…})</code> | | <code>{}</code> |
|
|
|
|
|
| [revision_name](variables.tf#L177) | Revision name. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [service_account](variables.tf#L183) | Service account email. Unused if service account is auto-created. | <code>string</code> | | <code>null</code> |
|
|
|
|
|
| [service_account_create](variables.tf#L189) | Auto-create service account. | <code>bool</code> | | <code>false</code> |
|
|
|
|
|
| [timeout_seconds](variables.tf#L195) | Maximum duration the instance is allowed for responding to a request. | <code>number</code> | | <code>null</code> |
|
|
|
|
|
| [traffic](variables.tf#L201) | Traffic steering configuration. If revision name is null the latest revision will be used. | <code title="map(object({ percent = number latest = optional(bool) tag = optional(string) }))">map(object({…}))</code> | | <code>{}</code> |
|
|
|
|
|
| [volumes](variables.tf#L212) | Named volumes in containers in name => attributes format. | <code title="map(object({ secret_name = string default_mode = optional(string) items = optional(map(object({ path = string mode = optional(string) }))) }))">map(object({…}))</code> | | <code>{}</code> |
|
|
|
|
|
| [vpc_connector_create](variables.tf#L226) | Populate this to create a VPC connector. You can then refer to it in the template annotations. | <code title="object({ ip_cidr_range = optional(string) vpc_self_link = optional(string) machine_type = optional(string) name = optional(string) instances = optional(object({ max = optional(number) min = optional(number) }), {}) throughput = optional(object({ max = optional(number) min = optional(number) }), {}) subnet = optional(object({ name = optional(string) project_id = optional(string) }), {}) })">object({…})</code> | | <code>null</code> |
|
|
|
|
|
|
|
|
|
|
## Outputs
|
|
|
|
|
|
|
|
|
|
@ -348,5 +368,4 @@ module "cloud_run" {
|
|
|
|
|
| [service_account_iam_email](outputs.tf#L38) | Service account email. | |
|
|
|
|
|
| [service_name](outputs.tf#L46) | Cloud Run service name. | |
|
|
|
|
|
| [vpc_connector](outputs.tf#L52) | VPC connector resource if created. | |
|
|
|
|
|
|
|
|
|
|
<!-- END TFDOC -->
|
|
|
|
|
|
Ludovico Magnocavallo
GitHub