Add support for GPU fields in Cloud Run v2 Job (GA) (#14423) (#23586)

modular-magician · web-flow · commit b2f7d13df621 · 2025-07-11T14:30:55.000-07:00
[upstream:39be39fee22bcda170fd422fb86a76f26d2c90f4]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/14423.txt b/.changelog/14423.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudrunv2: promoted field `node_selector` in `google_cloud_run_v2_job` resource to GA
+```
diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job.go b/google/services/cloudrunv2/resource_cloud_run_v2_job.go
@@ -344,6 +344,21 @@ Must be smaller than periodSeconds.`,
 										Description: `Number of retries allowed per Task, before marking this Task failed. Defaults to 3. Minimum value is 0.`,
 										Default:     3,
 									},
+									"node_selector": {
+										Type:        schema.TypeList,
+										Optional:    true,
+										Description: `Node Selector describes the hardware requirements of the resources.`,
+										MaxItems:    1,
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"accelerator": {
+													Type:        schema.TypeString,
+													Required:    true,
+													Description: `The GPU to attach to an instance. See https://cloud.google.com/run/docs/configuring/jobs/gpu for configuring GPU.`,
+												},
+											},
+										},
+									},
 									"service_account": {
 										Type:        schema.TypeString,
 										Computed:    true,
@@ -1564,6 +1579,8 @@ func flattenCloudRunV2JobTemplateTemplate(v interface{}, d *schema.ResourceData,
 		flattenCloudRunV2JobTemplateTemplateVpcAccess(original["vpcAccess"], d, config)
 	transformed["max_retries"] =
 		flattenCloudRunV2JobTemplateTemplateMaxRetries(original["maxRetries"], d, config)
+	transformed["node_selector"] =
+		flattenCloudRunV2JobTemplateTemplateNodeSelector(original["nodeSelector"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudRunV2JobTemplateTemplateContainers(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -2273,6 +2290,23 @@ func flattenCloudRunV2JobTemplateTemplateMaxRetries(v interface{}, d *schema.Res
 	return v // let terraform core handle it otherwise
 }
 
+func flattenCloudRunV2JobTemplateTemplateNodeSelector(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["accelerator"] =
+		flattenCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(original["accelerator"], d, config)
+	return []interface{}{transformed}
+}
+func flattenCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenCloudRunV2JobObservedGeneration(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -2669,6 +2703,13 @@ func expandCloudRunV2JobTemplateTemplate(v interface{}, d tpgresource.TerraformR
 		transformed["maxRetries"] = transformedMaxRetries
 	}
 
+	transformedNodeSelector, err := expandCloudRunV2JobTemplateTemplateNodeSelector(original["node_selector"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedNodeSelector); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["nodeSelector"] = transformedNodeSelector
+	}
+
 	return transformed, nil
 }
 
@@ -3612,6 +3653,29 @@ func expandCloudRunV2JobTemplateTemplateMaxRetries(v interface{}, d tpgresource.
 	return v, nil
 }
 
+func expandCloudRunV2JobTemplateTemplateNodeSelector(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedAccelerator, err := expandCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(original["accelerator"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedAccelerator); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["accelerator"] = transformedAccelerator
+	}
+
+	return transformed, nil
+}
+
+func expandCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudRunV2JobEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil
diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_meta.yaml b/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_meta.yaml
@@ -77,6 +77,7 @@ fields:
   - field: 'template.template.encryption_key'
   - field: 'template.template.execution_environment'
   - field: 'template.template.max_retries'
+  - field: 'template.template.node_selector.accelerator'
   - field: 'template.template.service_account'
   - field: 'template.template.timeout'
   - field: 'template.template.volumes.cloud_sql_instance.instances'
diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go
@@ -534,6 +534,52 @@ resource "google_cloud_run_v2_job" "default" {
 `, context)
 }
 
+func TestAccCloudRunV2Job_cloudrunv2JobGpuExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckCloudRunV2JobDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCloudRunV2Job_cloudrunv2JobGpuExample(context),
+			},
+			{
+				ResourceName:            "google_cloud_run_v2_job.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"annotations", "deletion_protection", "labels", "location", "name", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccCloudRunV2Job_cloudrunv2JobGpuExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_cloud_run_v2_job" "default" {
+  name     = "tf-test-cloudrun-job%{random_suffix}"
+  location = "us-central1"
+  deletion_protection = false
+  launch_stage = "BETA"
+  template {
+    template {
+      containers {
+        image = "us-docker.pkg.dev/cloudrun/container/job"
+      }
+      node_selector {
+        accelerator = "nvidia-l4"
+      }
+    }
+  }
+}
+`, context)
+}
+
 func testAccCheckCloudRunV2JobDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {
diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job_test.go b/google/services/cloudrunv2/resource_cloud_run_v2_job_test.go
@@ -891,3 +891,72 @@ resource "google_cloud_run_v2_job" "default" {
 }
 `, context)
 }
+
+func TestAccCloudRunV2Job_cloudrunv2JobWithGpuUpdate(t *testing.T) {
+	acctest.SkipIfVcr(t)
+	t.Parallel()
+
+	jobName := fmt.Sprintf("tf-test-cloudrun-job-gpu%s", acctest.RandString(t, 10))
+	context := map[string]interface{}{
+		"job_name": jobName,
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckCloudRunV2JobDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCloudRunV2Job_cloudrunv2BasicJob(context),
+			},
+			{
+				ResourceName:            "google_cloud_run_v2_job.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "launch_stage", "deletion_protection"},
+			},
+			{
+				Config: testAccCloudRunV2Job_cloudrunv2JobWithGpu(context),
+			},
+			{
+				ResourceName:            "google_cloud_run_v2_job.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "launch_stage", "deletion_protection"},
+			},
+		},
+	})
+}
+
+func testAccCloudRunV2Job_cloudrunv2JobWithGpu(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+  resource "google_cloud_run_v2_job" "default" {
+    name     = "%{job_name}"
+    location = "us-central1"
+    launch_stage = "BETA"
+    deletion_protection = false
+    template {
+      template {
+        containers {
+          image = "us-docker.pkg.dev/cloudrun/container/job"
+          resources {
+            limits = {
+              "cpu" = "4"
+              "memory" = "16Gi"
+              "nvidia.com/gpu" = "1"
+            }
+          }
+        }
+        node_selector {
+          accelerator = "nvidia-l4"
+        }
+      }
+    }
+    lifecycle {
+      ignore_changes = [
+        launch_stage,
+      ]
+    }
+  }
+`, context)
+}
diff --git a/website/docs/r/cloud_run_v2_job.html.markdown b/website/docs/r/cloud_run_v2_job.html.markdown
@@ -407,7 +407,6 @@ resource "google_cloud_run_v2_job" "default" {
 
 ```hcl
 resource "google_cloud_run_v2_job" "default" {
-  provider = google-beta
   name     = "cloudrun-job"
   location = "us-central1"
   deletion_protection = false
@@ -575,7 +574,7 @@ When the field is set to false, deleting the job is allowed.
   Number of retries allowed per Task, before marking this Task failed. Defaults to 3. Minimum value is 0.
 
 * `node_selector` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   Node Selector describes the hardware requirements of the resources.
   Structure is [documented below](#nested_template_template_node_selector).
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+cloudrunv2: promoted field `node_selector` in `google_cloud_run_v2_job` resource to GA
	`3`	+```