feat: move emptydir to GA for cloudrun and cloudrunv2 (#12230) (#844)

[upstream:8a6f281bad55b80c3e9f6d739729cb5d78646ab3]

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

Author: modular-magician

cloudrunv2_job_emptydir/main.tf

@@ -1,12 +1,11 @@
 resource "google_cloud_run_v2_job" "default" {
-  provider = google-beta
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
-  launch_stage = "BETA"
+  deletion_protection = false
   template {
     template {
       containers {
-        image = "us-docker.pkg.dev/cloudrun/container/hello"
+        image = "us-docker.pkg.dev/cloudrun/container/job"
 	volume_mounts {
 	  name = "empty-dir-volume"
 	  mount_path = "/mnt"
@@ -21,10 +20,4 @@ resource "google_cloud_run_v2_job" "default" {
       }
     }
   }
-
-  lifecycle {
-    ignore_changes = [
-      launch_stage,
-    ]
-  }
 }

cloudrunv2_service_multicontainer/main.tf

@@ -1,8 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
-  provider = google-beta
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
-  launch_stage = "BETA"
+  deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
   template {
     containers {
@@ -14,12 +13,21 @@ resource "google_cloud_run_v2_service" "default" {
       depends_on = ["hello-2"]
       volume_mounts {
         name = "empty-dir-volume"
-	mount_path = "/mnt"
+        mount_path = "/mnt"
       }
     }
     containers {
       name = "hello-2"
       image = "us-docker.pkg.dev/cloudrun/container/hello"
+      env {
+        name = "PORT"
+        value = "8081"
+      }
+      startup_probe {
+        http_get {
+          port = 8081
+        }
+      }
     }
     volumes {
       name = "empty-dir-volume"
@@ -29,10 +37,4 @@ resource "google_cloud_run_v2_service" "default" {
       }
     }
   }
-
-  lifecycle {
-    ignore_changes = [
-      launch_stage,
-    ]
-  }
 }