Add support for custom environmentd environment variables

Author: bobbyiliev

README.md

@@ -77,7 +77,7 @@ No modules.
 | <a name="input_helm_repository"></a> [helm\_repository](#input\_helm\_repository) | Repository URL for the Materialize operator Helm chart. Leave empty if using local chart. | `string` | `"https://materializeinc.github.io/materialize/"` | no |
 | <a name="input_helm_values"></a> [helm\_values](#input\_helm\_values) | Values to pass to the Helm chart | `any` | n/a | yes |
 | <a name="input_install_metrics_server"></a> [install\_metrics\_server](#input\_install\_metrics\_server) | Whether to install the metrics-server | `bool` | `true` | no |
-| <a name="input_instances"></a> [instances](#input\_instances) | Configuration for Materialize instances | <pre>list(object({<br/>    name                    = string<br/>    namespace               = optional(string)<br/>    create_database         = optional(bool, true)<br/>    database_name           = string<br/>    metadata_backend_url    = string<br/>    persist_backend_url     = string<br/>    license_key             = optional(string)<br/>    environmentd_version    = optional(string, "v0.130.12") # META: mz version<br/>    environmentd_extra_args = optional(list(string), [])<br/>    cpu_request             = optional(string, "1")<br/>    memory_request          = optional(string, "1Gi")<br/>    memory_limit            = optional(string, "1Gi")<br/>    in_place_rollout        = optional(bool, true)<br/>    request_rollout         = optional(string, "00000000-0000-0000-0000-000000000001")<br/>    force_rollout           = optional(string, "00000000-0000-0000-0000-000000000001")<br/>    balancer_memory_request = optional(string, "256Mi")<br/>    balancer_memory_limit   = optional(string, "256Mi")<br/>    balancer_cpu_request    = optional(string, "100m")<br/>  }))</pre> | `[]` | no |
+| <a name="input_instances"></a> [instances](#input\_instances) | Configuration for Materialize instances | <pre>list(object({<br/>    name                 = string<br/>    namespace            = optional(string)<br/>    create_database      = optional(bool, true)<br/>    database_name        = string<br/>    metadata_backend_url = string<br/>    persist_backend_url  = string<br/>    license_key          = optional(string)<br/>    environmentd_version = optional(string, "v0.130.12") # META: mz version<br/>    environmentd_extra_env = optional(list(object({<br/>      name  = string<br/>      value = string<br/>    })), [])<br/>    cpu_request             = optional(string, "1")<br/>    memory_request          = optional(string, "1Gi")<br/>    memory_limit            = optional(string, "1Gi")<br/>    in_place_rollout        = optional(bool, true)<br/>    request_rollout         = optional(string, "00000000-0000-0000-0000-000000000001")<br/>    force_rollout           = optional(string, "00000000-0000-0000-0000-000000000001")<br/>    balancer_memory_request = optional(string, "256Mi")<br/>    balancer_memory_limit   = optional(string, "256Mi")<br/>    balancer_cpu_request    = optional(string, "100m")<br/>  }))</pre> | `[]` | no |
 | <a name="input_metrics_server_version"></a> [metrics\_server\_version](#input\_metrics\_server\_version) | Version of metrics-server to install | `string` | `"3.12.2"` | no |
 | <a name="input_monitoring_namespace"></a> [monitoring\_namespace](#input\_monitoring\_namespace) | Namespace for monitoring resources | `string` | `"monitoring"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace prefix for all resources | `string` | n/a | yes |

main.tf

@@ -86,7 +86,7 @@ resource "kubernetes_manifest" "materialize_instances" {
       requestRollout       = lookup(each.value, "request_rollout", null)
       forceRollout         = lookup(each.value, "force_rollout", null)
 
-      environmentdExtraArgs = length(lookup(each.value, "environmentd_extra_args", [])) > 0 ? each.value.environmentd_extra_args : null
+      environmentdExtraEnv = length(lookup(each.value, "environmentd_extra_env", [])) > 0 ? each.value.environmentd_extra_env : null
 
       environmentdResourceRequirements = {
         limits = {

variables.tf

@@ -65,15 +65,18 @@ variable "install_metrics_server" {
 variable "instances" {
   description = "Configuration for Materialize instances"
   type = list(object({
-    name                    = string
-    namespace               = optional(string)
-    create_database         = optional(bool, true)
-    database_name           = string
-    metadata_backend_url    = string
-    persist_backend_url     = string
-    license_key             = optional(string)
-    environmentd_version    = optional(string, "v0.130.12") # META: mz version
-    environmentd_extra_args = optional(list(string), [])
+    name                 = string
+    namespace            = optional(string)
+    create_database      = optional(bool, true)
+    database_name        = string
+    metadata_backend_url = string
+    persist_backend_url  = string
+    license_key          = optional(string)
+    environmentd_version = optional(string, "v0.130.12") # META: mz version
+    environmentd_extra_env = optional(list(object({
+      name  = string
+      value = string
+    })), [])
     cpu_request             = optional(string, "1")
     memory_request          = optional(string, "1Gi")
     memory_limit            = optional(string, "1Gi")