Merge pull request #48 from cabify/jvp/make-timeout-seconds-variable

Make liveness probe timeout variable
cabify · Dec 14, 2018 · fb0fa00 · fb0fa00
2 parents 3a7ca1e + ed6a0f6
commit fb0fa00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/apps/prometheus/inputs.tf b/apps/prometheus/inputs.tf
@@ -45,6 +45,12 @@ variable "livenessprobe_delay" {
   default     = "30"
 }
 
+variable "livenessprobe_timeout_seconds" {
+  description = "Number of seconds after which the probe times out"
+  type        = "string"
+  default     = "5"
+}
+
 variable "external_url" {
   description = "External URL. Read about web.external-url in prometheus config"
   type        = "string"

diff --git a/apps/prometheus/replication-controller.tf b/apps/prometheus/replication-controller.tf
@@ -143,6 +143,7 @@ resource "kubernetes_replication_controller" "prometheus" {
 
           initial_delay_seconds = "${var.livenessprobe_delay}"
           period_seconds        = 3
+          timeout_seconds       = "${var.livenessprobe_timeout_seconds}"
         }
       }
     }