1 cpu

Author: max-ostapenko

terraform/dev/main.tf

@@ -140,9 +140,7 @@ module "endpoints" {
   region                           = var.region
   service_account_email            = var.google_service_account_cloud_functions
   service_account_api_gateway      = var.google_service_account_api_gateway
-  max_instances                    = var.max_instances
   min_instances                    = var.min_instances
-  max_instance_request_concurrency = var.max_instance_request_concurrency
   environment_variables = {
     "PROJECT"  = var.project
     "DATABASE" = var.project_database

terraform/dev/variables.tf

@@ -27,18 +27,8 @@ variable "google_service_account_api_gateway" {
   description = "Service account for API Gateway"
 }
 
-variable "max_instances" {
-  default     = 10
-  type        = number
-  description = "(Optional) The limit on the maximum number of function instances that may coexist at a given time."
-}
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number
-  default     = 1
-}
-variable "max_instance_request_concurrency" {
-  description = "(Optional) The limit on the maximum number of requests that an instance can handle simultaneously. This can be used to control costs when scaling. Defaults to 1."
-  type        = number
-  default     = 10
+  default     = 1 # TODO: Update this to 0 after performance testing
 }

terraform/modules/cloud-function/variables.tf

@@ -61,7 +61,7 @@ variable "max_instances" {
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number
-  default     = 0
+  default     = 1
 }
 variable "max_instance_request_concurrency" {
   description = "(Optional) The limit on the maximum number of requests that an instance can handle simultaneously. This can be used to control costs when scaling. Defaults to 1."

terraform/modules/run-service/main.tf

@@ -31,6 +31,7 @@ resource "google_cloudfunctions2_function" "function" {
   service_config {
     all_traffic_on_latest_revision = true
     available_memory               = var.available_memory_mb
+    available_cpu                  = var.available_cpu
     ingress_settings               = var.ingress_settings
 
     environment_variables = var.environment_variables

terraform/modules/run-service/variables.tf

@@ -26,6 +26,11 @@ variable "available_memory_mb" {
   type        = string
   description = "The amount of memory for the Cloud Function"
 }
+variable "available_cpu" {
+  default     = "1"
+  type        = string
+  description = "The amount of CPU for the Cloud Function"
+}
 variable "ingress_settings" {
   type        = string
   default     = "ALLOW_ALL"
@@ -54,19 +59,19 @@ variable "service_account_api_gateway" {
   description = "API Gateway service account who can invoke this function. This is required!"
 }
 variable "max_instances" {
-  default     = 1
+  default     = 10
   type        = number
   description = "(Optional) The limit on the maximum number of function instances that may coexist at a given time."
 }
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number
-  default     = 0
+  default     = 1
 }
 variable "max_instance_request_concurrency" {
   description = "(Optional) The limit on the maximum number of requests that an instance can handle simultaneously. This can be used to control costs when scaling. Defaults to 1."
   type        = number
-  default     = 1
+  default     = 18
 }
 variable "environment_variables" {
   description = "environment_variables"

terraform/prod/variables.tf

@@ -26,19 +26,8 @@ variable "google_service_account_api_gateway" {
   type        = string
   description = "Service account for API Gateway"
 }
-
-variable "max_instances" {
-  default     = 5
-  type        = number
-  description = "(Optional) The limit on the maximum number of function instances that may coexist at a given time."
-}
 variable "min_instances" {
   description = "(Optional) The limit on the minimum number of function instances that may coexist at a given time."
   type        = number
   default     = 1
 }
-variable "max_instance_request_concurrency" {
-  description = "(Optional) The limit on the maximum number of requests that an instance can handle simultaneously. This can be used to control costs when scaling. Defaults to 1."
-  type        = number
-  default     = 5
-}