Merge pull request #252 from ExpediaDotCom/allow_backend_envVars

allow extra environment variables for backend in terraform

Author: keshavpeswani

deployment/terraform/main.tf

@@ -27,9 +27,7 @@ module "trace-indexer" {
   backend_memory_limit = "${var.traces["backend_memory_limit"]}"
   backend_memory_request = "${var.traces["backend_memory_request"]}"
   backend_jvm_memory_limit = "${var.traces["backend_jvm_memory_limit"]}"
-  cassandra_retries_max = "${var.traces["backend_cassandra_retries_max"]}"
-  cassandra_backoff_initial_ms = "${var.traces["backend_cassandra_backoff_initial_ms"]}"
-  cassandra_backoff_factor = "${var.traces["backend_cassandra_backoff_factor"]}"
+  backend_env_vars = "${var.traces["backend_environment_overrides"]}"
 }
 
 module "trace-reader" {
@@ -58,6 +56,7 @@ module "trace-reader" {
   backend_memory_request = "${var.traces["backend_memory_request"]}"
   backend_jvm_memory_limit = "${var.traces["backend_jvm_memory_limit"]}"
   env_vars = "${var.traces["reader_environment_overrides"]}"
+  backend_env_vars = "${var.traces["backend_environment_overrides"]}"
 }
 
 module "es-indices" {

deployment/terraform/trace-indexer/main.tf

@@ -40,9 +40,6 @@ data "template_file" "deployment_yaml" {
     graphite_host = "${var.graphite_hostname}"
     graphite_enabled = "${var.graphite_enabled}"
     cassandra_hostname = "${var.cassandra_hostname}"
-    cassandra_retries_max = "${var.cassandra_retries_max}"
-    cassandra_backoff_initial_ms = "${var.cassandra_backoff_initial_ms}"
-    cassandra_backoff_factor = "${var.cassandra_backoff_factor}"
     node_selecter_label = "${var.node_selector_label}"
     storage_backend_image = "${var.storage_backend_image}"
     indexer_image = "${var.indexer_image}"
@@ -60,7 +57,7 @@ data "template_file" "deployment_yaml" {
 
     configmap_name = "${local.configmap_name}"
     env_vars= "${indent(9,"${var.env_vars}")}"
-
+    backend_env_vars = "${indent(9,"${var.backend_env_vars}")}"
   }
 }
 

deployment/terraform/trace-indexer/templates/deployment.yaml

@@ -31,12 +31,6 @@ spec:
         env:
         - name: "HAYSTACK_PROP_CASSANDRA_ENDPOINTS"
           value: "${cassandra_hostname}"
-        - name: "HAYSTACK_PROP_CASSANDRA_RETRIES_MAX"
-          value: "${cassandra_retries_max}"
-        - name: "HAYSTACK_PROP_CASSANDRA_BACKOFF_INITIAL_MS"
-          value: "${cassandra_backoff_initial_ms}"
-        - name: "HAYSTACK_PROP_CASSANDRA_BACKOFF_FACTOR"
-          value: "${cassandra_backoff_factor}"
         - name: "HAYSTACK_GRAPHITE_HOST"
           value: "${graphite_host}"
         - name: "HAYSTACK_GRAPHITE_PORT"
@@ -47,6 +41,7 @@ spec:
           value: "${backend_jvm_memory_limit}m"
         - name: "JAVA_XMX"
           value: "${backend_jvm_memory_limit}m"
+        ${backend_env_vars}
         livenessProbe:
           exec:
             command:

deployment/terraform/trace-indexer/variables.tf

@@ -7,9 +7,6 @@ variable "elasticsearch_hostname" {}
 variable "elasticsearch_port" {}
 variable "elasticsearch_template" {}
 variable "cassandra_hostname" {}
-variable "cassandra_retries_max" {}
-variable "cassandra_backoff_initial_ms" {}
-variable "cassandra_backoff_factor" {}
 variable "graphite_hostname" {}
 variable "graphite_port" {}
 variable "graphite_enabled" {}
@@ -28,6 +25,7 @@ variable "backend_jvm_memory_limit"{}
 variable "backend_cpu_request"{}
 variable "backend_cpu_limit"{}
 variable "env_vars" {}
+variable "backend_env_vars" {}
 variable "enable_kafka_sink" {
   default = false
 }

deployment/terraform/trace-reader/main.tf

@@ -54,7 +54,7 @@ data "template_file" "deployment_yaml" {
     container_port = "${var.container_port}"
     configmap_name = "${local.configmap_name}"
     env_vars= "${indent(9,"${var.env_vars}")}"
-
+    backend_env_vars = "${indent(9,"${var.backend_env_vars}")}"
   }
 }
 

deployment/terraform/trace-reader/templates/deployment.yaml

@@ -41,6 +41,7 @@ spec:
           value: "${backend_jvm_memory_limit}m"
         - name: "JAVA_XMX"
           value: "${backend_jvm_memory_limit}m"
+        ${backend_env_vars}
         livenessProbe:
           exec:
             command:

deployment/terraform/trace-reader/variables.tf

@@ -22,6 +22,7 @@ variable "backend_jvm_memory_limit"{}
 variable "backend_cpu_request"{}
 variable "backend_cpu_limit"{}
 variable "env_vars" {}
+variable "backend_env_vars" {}
 
 variable "termination_grace_period" {
   default = 30