Skip to content

Commit b2b9e59

Browse files
committed
Change environmentd_extra_args to accept list of strings
1 parent f33e96e commit b2b9e59

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ No modules.
7777
| <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 |
7878
| <a name="input_helm_values"></a> [helm\_values](#input\_helm\_values) | Values to pass to the Helm chart | `any` | n/a | yes |
7979
| <a name="input_install_metrics_server"></a> [install\_metrics\_server](#input\_install\_metrics\_server) | Whether to install the metrics-server | `bool` | `true` | no |
80-
| <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.13") # META: mz version<br/> environmentd_extra_env = optional(list(object({<br/> name = string<br/> value = string<br/> })), [])<br/> environmentd_extra_args = 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 |
80+
| <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.13") # META: mz version<br/> environmentd_extra_env = optional(list(object({<br/> name = string<br/> value = string<br/> })), [])<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 |
8181
| <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 |
8282
| <a name="input_monitoring_namespace"></a> [monitoring\_namespace](#input\_monitoring\_namespace) | Namespace for monitoring resources | `string` | `"monitoring"` | no |
8383
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace prefix for all resources | `string` | n/a | yes |

examples/aws/terraform.tfvars.example

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
instance_configs_example = [
32
{
43
name = "mz-instance-1"
@@ -10,6 +9,10 @@ instance_configs_example = [
109
cpu_request = "2"
1110
memory_request = "4Gi"
1211
memory_limit = "8Gi"
12+
environmentd_extra_args = [
13+
"--system-parameter-default=max_clusters=100",
14+
"--system-parameter-default=max_connections=100"
15+
]
1316
},
1417
{
1518
name = "mz-instance-2"

examples/gcp/terraform.tfvars.example

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ instance_configs_example = [
99
cpu_request = "2"
1010
memory_request = "4Gi"
1111
memory_limit = "8Gi"
12+
environmentd_extra_args = [
13+
"--system-parameter-default=max_clusters=100",
14+
"--system-parameter-default=max_connections=100"
15+
]
1216
},
1317
{
1418
name = "mz-instance-2"

main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ locals {
1717
for instance in var.instances : instance.name =>
1818
length(lookup(instance, "environmentd_extra_args", [])) > 0 ? [
1919
for item in instance.environmentd_extra_args :
20-
"--system-parameter-default=${item.name}=${item.value}"
20+
item
2121
] : null
2222
}
2323
}

variables.tf

+1-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ variable "instances" {
7777
name = string
7878
value = string
7979
})), [])
80-
environmentd_extra_args = optional(list(object({
81-
name = string
82-
value = string
83-
})), [])
80+
environmentd_extra_args = optional(list(string), [])
8481
cpu_request = optional(string, "1")
8582
memory_request = optional(string, "1Gi")
8683
memory_limit = optional(string, "1Gi")

0 commit comments

Comments
 (0)