Add max instance count field to Cloud Run Service (GoogleCloudPlatform#14724)

Author: whaught

mmv1/products/cloudrunv2/Service.yaml

@@ -340,6 +340,10 @@ properties:
         type: Integer
         description: |
           Minimum number of instances for the service, to be divided among all revisions receiving traffic.
+      - name: 'maxInstanceCount'
+        type: Integer
+        description: |
+          Combined maximum number of instances for all revisions receiving traffic.
       - name: 'scalingMode'
         type: Enum
         description: |

mmv1/templates/terraform/examples/cloudrunv2_service_basic.tf.tmpl

@@ -3,6 +3,10 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
   location = "us-central1"
   deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
+
+  scaling {
+    max_instance_count = 100
+  }
 
   template {
     containers {

mmv1/templates/terraform/examples/cloudrunv2_service_gpu.tf.tmpl

@@ -4,6 +4,10 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
   deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
+  scaling {
+    max_instance_count = 1
+  }
+
   template {
     containers {
       image = "us-docker.pkg.dev/cloudrun/container/hello"
@@ -20,8 +24,5 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
       accelerator = "nvidia-l4"
     }
     gpu_zonal_redundancy_disabled = true
-    scaling {
-      max_instance_count = 1
-    }
   }
 }

mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl

@@ -4,11 +4,11 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
   deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
-  template {
-    scaling {
-      max_instance_count = 2
-    }
-  
+  scaling {
+    max_instance_count = 2
+  }
+
+  template { 
     volumes {
       name = "cloudsql"
       cloud_sql_instance {

mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_service_test.go.tmpl

@@ -63,17 +63,17 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "client-1"
   client_version = "client-version-1"
+  scaling {
+    min_instance_count = 1
+    max_instance_count = 3
+  }
   template {
     labels = {
       label-1 = "value-1"
     }
     timeout = "300s"
     service_account = google_service_account.service_account.email
     execution_environment = "EXECUTION_ENVIRONMENT_GEN2"
-    scaling {
-      max_instance_count = 3
-      min_instance_count = 1
-    }
     annotations = {
       generated-by = "magic-modules"
     }
@@ -131,18 +131,17 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "client-update"
   client_version = "client-version-update"
-
+  scaling {
+    min_instance_count = 1
+    max_instance_count = 2
+  }
   template {
     labels = {
       label-1 = "value-update"
     }
     timeout = "500s"
     service_account = google_service_account.service_account.email
     execution_environment = "EXECUTION_ENVIRONMENT_GEN1"
-    scaling {
-      max_instance_count = 2
-      min_instance_count = 1
-    }
     annotations = {
       generated-by = "magic-modules"
     }
@@ -253,17 +252,17 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "client-1"
   client_version = "client-version-1"
+  scaling {
+    min_instance_count = 1
+    max_instance_count = 3
+  }
   template {
     labels = {
       label-1 = "value-1"
     }
     timeout = "300s"
     service_account = google_service_account.service_account.email
     execution_environment = "EXECUTION_ENVIRONMENT_GEN2"
-    scaling {
-      max_instance_count = 3
-      min_instance_count = 1
-    }
     annotations = {
       generated-by = "magic-modules"
     }
@@ -1327,6 +1326,9 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "client-1"
   client_version = "client-version-1"
+  scaling {
+    max_instance_count = 1
+  }
   template {
     containers {
       image = "us-docker.pkg.dev/cloudrun/container/hello"
@@ -1338,9 +1340,6 @@ resource "google_cloud_run_v2_service" "default" {
         startup_cpu_boost = true
       }
     }
-    scaling {
-      max_instance_count = 1
-    }
   }
 }
 `, context)
@@ -1362,6 +1361,9 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "client-1"
   client_version = "client-version-1"
+  scaling {
+    max_instance_count = 1
+  }
   template {
     containers {
       image = "us-docker.pkg.dev/cloudrun/container/hello"
@@ -1378,9 +1380,6 @@ resource "google_cloud_run_v2_service" "default" {
       accelerator = "nvidia-l4"
     }
     gpu_zonal_redundancy_disabled = true
-    scaling {
-      max_instance_count = 1
-    }
   }
 }
 `, context)