Add support for GPU redundancy to Cloud Run v2 job (#14673) (#10440)

[upstream:241e95dfcfaad297ddeea85796ed38404535b4f1]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14673.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudrunv2: added `gpu_zonal_redundancy_disabled` field to `google_cloud_run_v2_job` resource.
+```

google-beta/services/cloudrunv2/resource_cloud_run_v2_job.go

@@ -338,6 +338,11 @@ Must be smaller than periodSeconds.`,
 										ValidateFunc: verify.ValidateEnum([]string{"EXECUTION_ENVIRONMENT_GEN1", "EXECUTION_ENVIRONMENT_GEN2", ""}),
 										Description:  `The execution environment being used to host this Task. Possible values: ["EXECUTION_ENVIRONMENT_GEN1", "EXECUTION_ENVIRONMENT_GEN2"]`,
 									},
+									"gpu_zonal_redundancy_disabled": {
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Description: `True if GPU zonal redundancy is disabled on this execution.`,
+									},
 									"max_retries": {
 										Type:        schema.TypeInt,
 										Optional:    true,
@@ -1642,6 +1647,8 @@ func flattenCloudRunV2JobTemplateTemplate(v interface{}, d *schema.ResourceData,
 		flattenCloudRunV2JobTemplateTemplateMaxRetries(original["maxRetries"], d, config)
 	transformed["node_selector"] =
 		flattenCloudRunV2JobTemplateTemplateNodeSelector(original["nodeSelector"], d, config)
+	transformed["gpu_zonal_redundancy_disabled"] =
+		flattenCloudRunV2JobTemplateTemplateGpuZonalRedundancyDisabled(original["gpuZonalRedundancyDisabled"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudRunV2JobTemplateTemplateContainers(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -2374,6 +2381,10 @@ func flattenCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(v interface{},
 	return v
 }
 
+func flattenCloudRunV2JobTemplateTemplateGpuZonalRedundancyDisabled(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
 }
@@ -2785,6 +2796,13 @@ func expandCloudRunV2JobTemplateTemplate(v interface{}, d tpgresource.TerraformR
 		transformed["nodeSelector"] = transformedNodeSelector
 	}
 
+	transformedGpuZonalRedundancyDisabled, err := expandCloudRunV2JobTemplateTemplateGpuZonalRedundancyDisabled(original["gpu_zonal_redundancy_disabled"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedGpuZonalRedundancyDisabled); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["gpuZonalRedundancyDisabled"] = transformedGpuZonalRedundancyDisabled
+	}
+
 	return transformed, nil
 }
 
@@ -3762,6 +3780,10 @@ func expandCloudRunV2JobTemplateTemplateNodeSelectorAccelerator(v interface{}, d
 	return v, nil
 }
 
+func expandCloudRunV2JobTemplateTemplateGpuZonalRedundancyDisabled(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

google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_meta.yaml

@@ -78,6 +78,7 @@ fields:
   - field: 'template.template.containers.working_dir'
   - field: 'template.template.encryption_key'
   - field: 'template.template.execution_environment'
+  - field: 'template.template.gpu_zonal_redundancy_disabled'
   - field: 'template.template.max_retries'
   - field: 'template.template.node_selector.accelerator'
   - field: 'template.template.service_account'

google-beta/services/cloudrunv2/resource_cloud_run_v2_job_generated_test.go

@@ -618,6 +618,7 @@ resource "google_cloud_run_v2_job" "default" {
       node_selector {
         accelerator = "nvidia-l4"
       }
+      gpu_zonal_redundancy_disabled = true
     }
   }
 }

google-beta/services/cloudrunv2/resource_cloud_run_v2_job_test.go

@@ -1067,6 +1067,7 @@ func testAccCloudRunV2Job_cloudrunv2JobWithGpu(context map[string]interface{}) s
         node_selector {
           accelerator = "nvidia-l4"
         }
+        gpu_zonal_redundancy_disabled = true
       }
     }
     lifecycle {

website/docs/r/cloud_run_v2_job.html.markdown

@@ -419,6 +419,7 @@ resource "google_cloud_run_v2_job" "default" {
       node_selector {
         accelerator = "nvidia-l4"
       }
+      gpu_zonal_redundancy_disabled = true
     }
   }
 }
@@ -578,6 +579,10 @@ When the field is set to false, deleting the job is allowed.
   Node Selector describes the hardware requirements of the resources.
   Structure is [documented below](#nested_template_template_node_selector).
 
+* `gpu_zonal_redundancy_disabled` -
+  (Optional)
+  True if GPU zonal redundancy is disabled on this execution.
+
 
 <a name="nested_template_template_containers"></a>The `containers` block supports: