Merge branch 'main' into specify-instance-max

Author: henrybell

terraform/modules/autoscaler-functions/main.tf

@@ -121,6 +121,7 @@ resource "google_cloudfunctions2_function" "poller_function" {
   service_config {
     max_instance_count    = var.poller_max_instance_count
     available_memory      = "256M"
+    available_cpu         = var.poller_function_available_cpu
     ingress_settings      = "ALLOW_INTERNAL_AND_GCLB"
     service_account_email = var.poller_sa_email
   }
@@ -153,6 +154,7 @@ resource "google_cloudfunctions2_function" "scaler_function" {
   service_config {
     max_instance_count    = var.scaler_max_instance_count
     available_memory      = "256M"
+    available_cpu         = var.scaler_function_available_cpu
     ingress_settings      = "ALLOW_INTERNAL_AND_GCLB"
     service_account_email = var.scaler_sa_email
   }

terraform/modules/autoscaler-functions/variables.tf

@@ -67,3 +67,23 @@ variable "poller_max_instance_count" {
   type        = number
   default     = null
 }
+
+variable "poller_function_available_cpu" {
+  type        = number
+  default     = null
+  description = "The amount of available CPU for the poller function. Unset/null will allow Cloud Run to default based on Memory."
+  validation {
+    condition     = var.poller_function_available_cpu == null ? true : var.poller_function_available_cpu >= 0.08
+    error_message = "The minimum value for poller_function_available_cpu is 0.08."
+  }
+}
+
+variable "scaler_function_available_cpu" {
+  type        = number
+  default     = null
+  description = "The amount of available CPU for the scaler function. Unset/null will allow Cloud Run to default based on Memory."
+  validation {
+    condition     = var.scaler_function_available_cpu == null ? true : var.scaler_function_available_cpu >= 0.08
+    error_message = "The minimum value for scaler_function_available_cpu is 0.08."
+  }
+}