Skip to content

Commit 1997953

Browse files
committed
Revert "Add OpenEBS install option"
This reverts commit 71ab5d1.
1 parent 43d2106 commit 1997953

File tree

4 files changed

+1
-67
lines changed

4 files changed

+1
-67
lines changed

README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,12 @@ No modules.
5353
|------|------|
5454
| [helm_release.materialize_operator](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
5555
| [helm_release.metrics_server](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
56-
| [helm_release.openebs](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
5756
| [kubernetes_job.db_init_job](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/job) | resource |
5857
| [kubernetes_manifest.materialize_instances](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/manifest) | resource |
5958
| [kubernetes_namespace.instance_namespaces](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
6059
| [kubernetes_namespace.materialize](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
6160
| [kubernetes_namespace.monitoring](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
62-
| [kubernetes_namespace.openebs](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
6361
| [kubernetes_secret.materialize_backends](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret) | resource |
64-
| [kubernetes_resource.materialize_instances](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/resource) | data source |
6562

6663
## Inputs
6764

@@ -72,13 +69,10 @@ No modules.
7269
| <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 |
7370
| <a name="input_helm_values"></a> [helm\_values](#input\_helm\_values) | Values to pass to the Helm chart | `any` | n/a | yes |
7471
| <a name="input_install_metrics_server"></a> [install\_metrics\_server](#input\_install\_metrics\_server) | Whether to install the metrics-server | `bool` | `true` | no |
75-
| <a name="input_install_openebs"></a> [install\_openebs](#input\_install\_openebs) | Whether to install OpenEBS for NVMe storage | `bool` | `false` | no |
76-
| <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/> environmentd_version = optional(string, "v0.130.4")<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 |
72+
| <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/> environmentd_version = optional(string, "v0.130.4")<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-000000000000")<br/> force_rollout = optional(string, "00000000-0000-0000-0000-000000000000")<br/> balancer_memory_request = optional(string, "256Mi")<br/> balancer_memory_limit = optional(string, "256Mi")<br/> balancer_cpu_request = optional(string, "100m")<br/> }))</pre> | `[]` | no |
7773
| <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 |
7874
| <a name="input_monitoring_namespace"></a> [monitoring\_namespace](#input\_monitoring\_namespace) | Namespace for monitoring resources | `string` | `"monitoring"` | no |
7975
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace prefix for all resources | `string` | n/a | yes |
80-
| <a name="input_openebs_namespace"></a> [openebs\_namespace](#input\_openebs\_namespace) | Namespace for OpenEBS components | `string` | `"openebs"` | no |
81-
| <a name="input_openebs_version"></a> [openebs\_version](#input\_openebs\_version) | Version of OpenEBS Helm chart to install | `string` | `"4.2.0"` | no |
8276
| <a name="input_operator_namespace"></a> [operator\_namespace](#input\_operator\_namespace) | Namespace for the Materialize operator | `string` | `"materialize"` | no |
8377
| <a name="input_operator_version"></a> [operator\_version](#input\_operator\_version) | Version of the Materialize operator to install | `string` | `"v25.1.2"` | no |
8478
| <a name="input_postgres_version"></a> [postgres\_version](#input\_postgres\_version) | Postgres version to use for the metadata backend | `string` | `"15"` | no |
@@ -88,10 +82,7 @@ No modules.
8882

8983
| Name | Description |
9084
|------|-------------|
91-
| <a name="output_materialize_instance_resource_ids"></a> [materialize\_instance\_resource\_ids](#output\_materialize\_instance\_resource\_ids) | Resource IDs of created Materialize instances |
9285
| <a name="output_materialize_instances"></a> [materialize\_instances](#output\_materialize\_instances) | Details of created Materialize instances |
93-
| <a name="output_openebs_enabled"></a> [openebs\_enabled](#output\_openebs\_enabled) | Whether OpenEBS is enabled |
94-
| <a name="output_openebs_namespace"></a> [openebs\_namespace](#output\_openebs\_namespace) | Namespace where OpenEBS is installed |
9586
| <a name="output_operator_namespace"></a> [operator\_namespace](#output\_operator\_namespace) | Namespace where the operator is installed |
9687
| <a name="output_operator_release_name"></a> [operator\_release\_name](#output\_operator\_release\_name) | Helm release name of the operator |
9788
| <a name="output_operator_release_status"></a> [operator\_release\_status](#output\_operator\_release\_status) | Status of the helm release |

main.tf

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -223,29 +223,3 @@ resource "helm_release" "metrics_server" {
223223

224224
depends_on = [kubernetes_namespace.monitoring]
225225
}
226-
227-
# Install OpenEBS for lgalloc support
228-
resource "kubernetes_namespace" "openebs" {
229-
count = var.install_openebs ? 1 : 0
230-
231-
metadata {
232-
name = var.openebs_namespace
233-
}
234-
}
235-
236-
resource "helm_release" "openebs" {
237-
count = var.install_openebs ? 1 : 0
238-
239-
name = "openebs"
240-
namespace = kubernetes_namespace.openebs[0].metadata[0].name
241-
repository = "https://openebs.github.io/charts"
242-
chart = "openebs"
243-
version = var.openebs_version
244-
245-
set {
246-
name = "engines.replicated.mayastor.enabled"
247-
value = "false"
248-
}
249-
250-
depends_on = [kubernetes_namespace.openebs]
251-
}

outputs.tf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,3 @@ output "materialize_instance_resource_ids" {
2929
for name, instance in data.kubernetes_resource.materialize_instances : name => instance.object.status.resourceId
3030
}
3131
}
32-
33-
output "openebs_enabled" {
34-
description = "Whether OpenEBS is enabled"
35-
value = var.install_openebs
36-
}
37-
38-
output "openebs_namespace" {
39-
description = "Namespace where OpenEBS is installed"
40-
value = var.install_openebs ? var.openebs_namespace : null
41-
}

variables.tf

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ variable "operator_namespace" {
4343
default = "materialize"
4444
}
4545

46-
# Monitoring configuration
4746
variable "monitoring_namespace" {
4847
description = "Namespace for monitoring resources"
4948
type = string
@@ -62,26 +61,6 @@ variable "install_metrics_server" {
6261
default = true
6362
}
6463

65-
# OpenEBS configuration
66-
variable "install_openebs" {
67-
description = "Whether to install OpenEBS for NVMe storage"
68-
type = bool
69-
default = false
70-
}
71-
72-
variable "openebs_namespace" {
73-
description = "Namespace for OpenEBS components"
74-
type = string
75-
default = "openebs"
76-
}
77-
78-
variable "openebs_version" {
79-
description = "Version of OpenEBS Helm chart to install"
80-
type = string
81-
default = "4.2.0"
82-
}
83-
84-
# Materialize instance configuration
8564
variable "instances" {
8665
description = "Configuration for Materialize instances"
8766
type = list(object({

0 commit comments

Comments
 (0)