Fix liveness probe (#12)

* Fix liveness probe

* Make health check times configurable

examples/complete/main.tf

@@ -29,7 +29,7 @@ module "cloud_run" {
   internal    = false
 
   container_image = "us-east1-docker.pkg.dev/superblocks-registry/superblocks/agent"
-  container_port  = "8020"
+  container_port  = "8080"
 
   container_env = {
     "SUPERBLOCKS_ORCHESTRATOR_LOG_LEVEL"               = "${var.superblocks_log_level}"

main.tf

@@ -52,6 +52,9 @@ module "cloud_run" {
   container_limits_memory   = var.container_limits_memory
   container_max_capacity    = var.container_max_capacity
   container_min_capacity    = var.container_min_capacity
+
+  health_check_failure_threshold = var.health_check_failure_threshold
+  health_check_period            = var.health_check_period
 }
 
 #################################################################

modules/cloud-run/main.tf

@@ -1,4 +1,5 @@
 resource "google_cloud_run_service" "superblocks" {
+  project  = var.project_id
   name     = "${var.name_prefix}-cloud-run-service"
   location = var.region
 
@@ -33,6 +34,20 @@ resource "google_cloud_run_service" "superblocks" {
             value = env.value
           }
         }
+        startup_probe {
+          tcp_socket {
+            port = var.container_port
+          }
+        }
+
+        liveness_probe {
+          failure_threshold = var.health_check_failure_threshold
+          period_seconds    = var.health_check_period
+          http_get {
+            path = "/health"
+            port = var.container_port
+          }
+        }
       }
     }
     metadata {

modules/cloud-run/provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.5.0"
+      version = ">= 5.0.0"
     }
   }
 }

modules/cloud-run/variables.tf

@@ -88,3 +88,15 @@ variable "cloud_run_member" {
   type    = string
   default = "allUsers"
 }
+
+variable "health_check_period" {
+  type        = number
+  default     = 10
+  description = "The interval between health checks in seconds"
+}
+
+variable "health_check_failure_threshold" {
+  type        = number
+  default     = 6
+  description = "The number of consecutive failed health checks before considering the agent unhealthy"
+}

provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.5.0"
+      version = ">= 5.0.0"
     }
   }
 }

variables.tf

@@ -116,8 +116,8 @@ variable "superblocks_agent_handle_cors" {
 }
 
 variable "superblocks_additional_env_vars" {
-  type       = map(any)
-  default    = {}
+  type        = map(any)
+  default     = {}
   description = "Additional environment variables to specify for the Superblocks Agent container."
 }