Merge branch 'main' into optional_ports

Author: atrull

CHANGELOG.md

@@ -7,6 +7,42 @@ The format is based on
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.20.1](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/compare/v0.20.0...v0.20.1) (2025-07-16)
+
+
+### Bug Fixes
+
+* remove alternate defaults for liveness and startup probe ([#371](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/371)) ([26d1d07](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/26d1d0726f515e0e136777d53f555d6a73eca952))
+
+## [0.20.0](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/compare/v0.19.0...v0.20.0) (2025-07-15)
+
+
+### Features
+
+* Add support for mounting gcs bucket in cloud run job ([#326](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/326)) ([1d470f1](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/1d470f14059a00fc4fa09e62cbe013a91d6be93c))
+
+
+### Bug Fixes
+
+* fixed liveness_probe and startup_probe alt defaults ([#370](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/370)) ([ec886b5](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/ec886b56536aa21565a168a2f0ee6cd7697b8e4d))
+* typo in min_instance ([#367](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/367)) ([9f0bd11](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/9f0bd1150382cab4c9bf24019abc85b8e597a2da))
+
+## [0.19.0](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/compare/v0.18.0...v0.19.0) (2025-07-14)
+
+
+### Features
+
+* Add connections for Memorystore in metadata.yaml ([#356](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/356)) ([7cf3156](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/7cf3156c460f0b8cc5a811bfeecf5753f2c7ea08))
+* Add GPU support for services. ([#352](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/352)) ([522aa12](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/522aa12ff90586c88b65f88f21212d74547f0146))
+* Identity-Aware Proxy (IAP) integration in Cloud Run v2 modules ([#353](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/353)) ([110fba6](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/110fba63986e3d1806b32b5d0f637064f3f2807b))
+
+
+### Bug Fixes
+
+* added field descriptions and validations ([#355](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/355)) ([db4f870](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/db4f8703d81dbf2bba2a655590656b1ce3804dd9))
+* trigger google_compute_default_service_account datasource only if the service account name is not provided ([#361](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/361)) ([403cacd](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/403cacd83d1ef3058319f1caa8f246606e6727fe))
+* update metadata and fix issue of service container name not being present ([#364](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/issues/364)) ([ae97b62](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/commit/ae97b626dd6a7928e0ef36cae8fa12fe842e6973))
+
 ## [0.18.0](https://github.com/GoogleCloudPlatform/terraform-google-cloud-run/compare/v0.17.5...v0.18.0) (2025-06-25)
 
 

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.24
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
@@ -40,7 +40,7 @@ docker_generate_docs:
 		-e ENABLE_BPMETADATA=1 \
 		-v $(CURDIR):/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
-		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'
+		/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'
 
 # Alias for backwards compatibility
 .PHONY: generate_docs
@@ -90,6 +90,7 @@ docker_test_cleanup:
 docker_test_integration:
 	docker run --rm -it \
 		-e SERVICE_ACCOUNT_JSON \
+		-e TF_VAR_project_id \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/test_integration.sh

build/int.cloudbuild.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-timeout: 3600s
+timeout: 7200s
 steps:
 - id: swap-module-refs
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
@@ -130,9 +130,38 @@ steps:
 - id: v2-gmp-teardown
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestV2WithGMP --stage teardown --verbose']
+- id: v2-iap-init
+  waitFor:
+    - v2-gmp-teardown
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithIAP --stage init --verbose']
+- id: v2-iap-apply
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithIAP --stage apply --verbose']
+- id: v2-iap-verify
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithIAP --stage verify --verbose']
+- id: v2-iap-teardown
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithIAP --stage teardown --verbose']
+- id: v2-gpu-init
+  waitFor:
+    - v2-iap-teardown
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithGPU --stage init --verbose']
+- id: v2-gpu-apply
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithGPU --stage apply --verbose']
+- id: v2-gpu-verify
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithGPU --stage verify --verbose']
+- id: v2-gpu-teardown
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['/bin/bash', '-c', 'cft test run TestV2WithGPU --stage teardown --verbose']
+
 tags:
 - 'ci'
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'

build/lint.cloudbuild.yaml

@@ -21,7 +21,7 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.24'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.25'
 options:
   env:
   - DISABLE_TFLINT=1

examples/v2_with_gpu/main.tf

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+resource "google_service_account" "sa" {
+  project      = var.project_id
+  account_id   = "ci-cloud-run-v2-sa"
+  display_name = "Service account for ci-cloud-run-v2"
+}
+
+module "cloud_run_v2_gpu" {
+  source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
+
+  service_name           = "ci-cloud-run-v2-gpu"
+  project_id             = var.project_id
+  location               = "us-central1"
+  create_service_account = false
+  service_account        = google_service_account.sa.email
+
+  cloud_run_deletion_protection = var.cloud_run_deletion_protection
+
+  containers = [{
+    container_image = "us-docker.pkg.dev/cloudrun/container/hello"
+    resources = {
+      limits = {
+        cpu        = "4"
+        memory     = "16Gi"
+        nvidia_gpu = "1"
+      }
+      cpu_idle = false
+    }
+  }]
+  node_selector = {
+    "accelerator" = "nvidia-l4"
+  }
+  gpu_zonal_redundancy_disabled = true
+}

examples/v2_with_gpu/outputs.tf

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+output "service_name" {
+  value       = module.cloud_run_v2_gpu.service_name
+  description = "Name of the created service"
+}
+
+output "revision" {
+  value       = module.cloud_run_v2_gpu.latest_created_revision
+  description = "Deployed revision for the service"
+}
+
+output "service_url" {
+  value       = module.cloud_run_v2_gpu.service_uri
+  description = "The URL on which the deployed service is available"
+}
+
+output "service_id" {
+  value       = module.cloud_run_v2_gpu.service_id
+  description = "Unique Identifier for the created service"
+}
+
+output "service_location" {
+  value       = module.cloud_run_v2_gpu.location
+  description = "Location in which the Cloud Run service was created"
+}

examples/v2_with_gpu/variables.tf

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+variable "project_id" {
+  description = "The project ID to deploy to"
+  type        = string
+}
+
+variable "cloud_run_deletion_protection" {
+  type        = bool
+  description = "This field prevents Terraform from destroying or recreating the Cloud Run v2 Jobs and Services"
+  default     = false
+}

examples/v2_with_iap/main.tf

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "cloud_run_v2" {
+  source  = "GoogleCloudPlatform/cloud-run/google//modules/v2"
+  version = "~> 0.16"
+
+  service_name = "ci-cloud-run-v2-iap"
+  project_id   = var.project_id
+  location     = "us-central1"
+  containers = [
+    {
+      container_image = "us-docker.pkg.dev/cloudrun/container/hello"
+      container_name  = "hello-world"
+    }
+  ]
+
+  launch_stage                  = "BETA"
+  iap_members                   = ["user:[email protected]"]
+  cloud_run_deletion_protection = false
+}

examples/v2_with_iap/outputs.tf

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+output "project_id" {
+  value       = module.cloud_run_v2.project_id
+  description = "Project ID of the service"
+}
+
+output "service_name" {
+  value       = module.cloud_run_v2.service_name
+  description = "Name of the created service"
+}
+
+output "service_uri" {
+  value       = module.cloud_run_v2.service_uri
+  description = "The URL on which the deployed service is available"
+}
+
+output "service_id" {
+  value       = module.cloud_run_v2.service_id
+  description = "Unique Identifier for the created service with format projects/{{project}}/locations/{{location}}/services/{{name}}"
+}
+
+output "service_location" {
+  value       = module.cloud_run_v2.location
+  description = "Location in which the Cloud Run service was created"
+}
+
+output "traffic_statuses" {
+  value       = module.cloud_run_v2.traffic_statuses
+  description = "Detailed status information for corresponding traffic targets."
+}
+
+output "observed_generation" {
+  value       = module.cloud_run_v2.observed_generation
+  description = "The generation of this Service currently serving traffic."
+}

examples/v2_with_iap/variables.tf

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+variable "project_id" {
+  description = "The project ID to deploy to"
+  type        = string
+}