Skip to content

Commit fa9031a

Browse files
Merge pull request #63 from MaterializeInc/license_key_support
license key support
2 parents 862a4a9 + 259c3f1 commit fa9031a

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ disk_support_config = {
110110

111111
| Name | Version |
112112
|------|---------|
113-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.88.0 |
113+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.94.1 |
114114

115115
## Modules
116116

@@ -122,19 +122,16 @@ disk_support_config = {
122122
| <a name="module_eks"></a> [eks](#module\_eks) | ./modules/eks | n/a |
123123
| <a name="module_networking"></a> [networking](#module\_networking) | ./modules/networking | n/a |
124124
| <a name="module_nlb"></a> [nlb](#module\_nlb) | ./modules/nlb | n/a |
125-
| <a name="module_operator"></a> [operator](#module\_operator) | github.com/MaterializeInc/terraform-helm-materialize | v0.1.9 |
125+
| <a name="module_operator"></a> [operator](#module\_operator) | github.com/MaterializeInc/terraform-helm-materialize | v0.1.11 |
126126
| <a name="module_storage"></a> [storage](#module\_storage) | ./modules/storage | n/a |
127127

128128
## Resources
129129

130130
| Name | Type |
131131
|------|------|
132132
| [aws_cloudwatch_log_group.materialize](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
133-
| [aws_iam_access_key.materialize_user](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_access_key) | resource |
134133
| [aws_iam_role.materialize_s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
135134
| [aws_iam_role_policy.materialize_s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
136-
| [aws_iam_user.materialize](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_user) | resource |
137-
| [aws_iam_user_policy.materialize_s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_user_policy) | resource |
138135
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
139136
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
140137

@@ -173,7 +170,7 @@ disk_support_config = {
173170
| <a name="input_install_metrics_server"></a> [install\_metrics\_server](#input\_install\_metrics\_server) | Whether to install the metrics-server for the Materialize Console | `bool` | `true` | no |
174171
| <a name="input_kubernetes_namespace"></a> [kubernetes\_namespace](#input\_kubernetes\_namespace) | The Kubernetes namespace for the Materialize resources | `string` | `"materialize-environment"` | no |
175172
| <a name="input_log_group_name_prefix"></a> [log\_group\_name\_prefix](#input\_log\_group\_name\_prefix) | Prefix for the CloudWatch log group name (will be combined with environment name) | `string` | `"materialize"` | no |
176-
| <a name="input_materialize_instances"></a> [materialize\_instances](#input\_materialize\_instances) | Configuration for Materialize instances. Due to limitations in Terraform, `materialize_instances` cannot be defined on the first `terraform apply`. | <pre>list(object({<br/> name = string<br/> namespace = optional(string)<br/> database_name = string<br/> environmentd_version = optional(string)<br/> cpu_request = optional(string, "1")<br/> memory_request = optional(string, "1Gi")<br/> memory_limit = optional(string, "1Gi")<br/> create_database = optional(bool, true)<br/> create_nlb = optional(bool, true)<br/> internal_nlb = optional(bool, true)<br/> enable_cross_zone_load_balancing = optional(bool, true)<br/> in_place_rollout = optional(bool, false)<br/> request_rollout = optional(string)<br/> force_rollout = optional(string)<br/> balancer_memory_request = optional(string, "256Mi")<br/> balancer_memory_limit = optional(string, "256Mi")<br/> balancer_cpu_request = optional(string, "100m")<br/> }))</pre> | `[]` | no |
173+
| <a name="input_materialize_instances"></a> [materialize\_instances](#input\_materialize\_instances) | Configuration for Materialize instances. Due to limitations in Terraform, `materialize_instances` cannot be defined on the first `terraform apply`. | <pre>list(object({<br/> name = string<br/> namespace = optional(string)<br/> database_name = string<br/> environmentd_version = optional(string)<br/> cpu_request = optional(string, "1")<br/> memory_request = optional(string, "1Gi")<br/> memory_limit = optional(string, "1Gi")<br/> create_database = optional(bool, true)<br/> create_nlb = optional(bool, true)<br/> internal_nlb = optional(bool, true)<br/> enable_cross_zone_load_balancing = optional(bool, true)<br/> in_place_rollout = optional(bool, false)<br/> request_rollout = optional(string)<br/> force_rollout = optional(string)<br/> balancer_memory_request = optional(string, "256Mi")<br/> balancer_memory_limit = optional(string, "256Mi")<br/> balancer_cpu_request = optional(string, "100m")<br/> license_key = optional(string)<br/> }))</pre> | `[]` | no |
177174
| <a name="input_metrics_retention_days"></a> [metrics\_retention\_days](#input\_metrics\_retention\_days) | Number of days to retain CloudWatch metrics | `number` | `7` | no |
178175
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace for all resources, usually the organization or project name | `string` | n/a | yes |
179176
| <a name="input_network_id"></a> [network\_id](#input\_network\_id) | The ID of the VPC in which resources will be deployed. Only used if create\_vpc is false. | `string` | `""` | no |

examples/simple/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ variable "materialize_instances" {
149149
balancer_memory_request = optional(string, "256Mi")
150150
balancer_memory_limit = optional(string, "256Mi")
151151
balancer_cpu_request = optional(string, "100m")
152+
license_key = optional(string)
152153
}))
153154
default = []
154155
}

main.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ module "certificates" {
128128
}
129129

130130
module "operator" {
131-
source = "github.com/MaterializeInc/terraform-helm-materialize?ref=v0.1.10"
131+
source = "github.com/MaterializeInc/terraform-helm-materialize?ref=v0.1.11"
132132

133133
count = var.install_materialize_operator ? 1 : 0
134134

@@ -285,6 +285,8 @@ locals {
285285
instance.name
286286
)
287287

288+
license_key = instance.license_key
289+
288290
cpu_request = instance.cpu_request
289291
memory_request = instance.memory_request
290292
memory_limit = instance.memory_limit

variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ variable "materialize_instances" {
366366
balancer_memory_request = optional(string, "256Mi")
367367
balancer_memory_limit = optional(string, "256Mi")
368368
balancer_cpu_request = optional(string, "100m")
369+
license_key = optional(string)
369370
}))
370371
default = []
371372

0 commit comments

Comments
 (0)