-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for NFS and GCS mounts in Cloud Run v2 service (#9728)
* feat: add support for NFS and GCS mounts in Cloud Run v2 service ```release-note:enhancement cloudrunv2: added `nfs` field to `google_cloud_run_v2_service.template.volumes` cloudrunv2: added `gcs` field to `google_cloud_run_v2_service.template.volumes` cloudrunv2: adding tcpSocket field to `google_cloud_run_v2.template.containers.livenessProbe` ``` * fix: add required to relevant properties
- Loading branch information
1 parent
f7232c1
commit 1de3c30
Showing
3 changed files
with
144 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
mmv1/templates/terraform/examples/cloudrunv2_service_mount_gcs.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| resource "google_cloud_run_v2_service" "<%= ctx[:primary_resource_id] %>" { | ||
| name = "<%= ctx[:vars]['cloud_run_service_name'] %>" | ||
|
|
||
| location = "us-central1" | ||
| launch_stage = "BETA" | ||
|
|
||
| template { | ||
| execution_environment = "EXECUTION_ENVIRONMENT_GEN2" | ||
|
|
||
| containers { | ||
| image = "us-docker.pkg.dev/cloudrun/container/hello" | ||
| volume_mounts { | ||
| name = "bucket" | ||
| mount_path = "/var/www" | ||
| } | ||
| } | ||
|
|
||
| volumes { | ||
| name = "bucket" | ||
| gcs { | ||
| bucket = google_storage_bucket.<%= ctx[:primary_resource_id] %>.name | ||
| read_only = false | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| resource "google_storage_bucket" "<%= ctx[:primary_resource_id] %>" { | ||
| name = "<%= ctx[:vars]['cloud_run_service_name'] %>" | ||
| location = "US" | ||
| } |
49 changes: 49 additions & 0 deletions
49
mmv1/templates/terraform/examples/cloudrunv2_service_mount_nfs.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| resource "google_cloud_run_v2_service" "<%= ctx[:primary_resource_id] %>" { | ||
| name = "<%= ctx[:vars]['cloud_run_service_name'] %>" | ||
|
|
||
| location = "us-central1" | ||
| ingress = "INGRESS_TRAFFIC_ALL" | ||
| launch_stage = "BETA" | ||
|
|
||
| template { | ||
| execution_environment = "EXECUTION_ENVIRONMENT_GEN2" | ||
| containers { | ||
| image = "us-docker.pkg.dev/cloudrun/container/hello:latest" | ||
| volume_mounts { | ||
| name = "nfs" | ||
| mount_path = "/mnt/nfs/filestore" | ||
| } | ||
| } | ||
| vpc_access { | ||
| network_interfaces { | ||
| network = "default" | ||
| subnetwork = "default" | ||
| } | ||
| } | ||
|
|
||
| volumes { | ||
| name = "nfs" | ||
| nfs { | ||
| server = google_filestore_instance.default.networks[0].ip_addresses[0] | ||
| path = "/share1" | ||
| read_only = false | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| resource "google_filestore_instance" "<%= ctx[:primary_resource_id] %>" { | ||
| name = "<%= ctx[:vars]['cloud_run_service_name'] %>" | ||
| location = "us-central1-b" | ||
| tier = "BASIC_HDD" | ||
|
|
||
| file_shares { | ||
| capacity_gb = 1024 | ||
| name = "share1" | ||
| } | ||
|
|
||
| networks { | ||
| network = "default" | ||
| modes = ["MODE_IPV4"] | ||
| } | ||
| } |