Skip to content

Commit 8f767b2

Browse files
committed
Pin to a specific lvm version
1 parent 310b34f commit 8f767b2

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,14 @@ enable_disk_support = true
7474
7575
gke_config = {
7676
node_count = 3
77-
machine_type = "n2-highmem-16" # This machine has 128GB RAM
77+
# This machine has 128GB RAM
78+
machine_type = "n2-highmem-16"
7879
disk_size_gb = 100
7980
min_nodes = 3
8081
max_nodes = 5
81-
local_ssd_count = 1 # This provides 1 x 375GB = 375GB of local NVMe SSD storage
82-
# Exceeding the 2:1 disk-to-RAM ratio (128GB RAM : 375GB disk)
82+
# This provides 1 x 375GB = 375GB of local NVMe SSD storage
83+
# Exceeding the 2:1 disk-to-RAM ratio (128GB RAM : 375GB disk)
84+
local_ssd_count = 1
8385
}
8486
8587
disk_support_config = {
@@ -149,7 +151,7 @@ No resources.
149151
| <a name="input_cert_manager_install_timeout"></a> [cert\_manager\_install\_timeout](#input\_cert\_manager\_install\_timeout) | Timeout for installing the cert-manager helm chart, in seconds. | `number` | `300` | no |
150152
| <a name="input_cert_manager_namespace"></a> [cert\_manager\_namespace](#input\_cert\_manager\_namespace) | The name of the namespace in which cert-manager is or will be installed. | `string` | `"cert-manager"` | no |
151153
| <a name="input_database_config"></a> [database\_config](#input\_database\_config) | Cloud SQL configuration | <pre>object({<br/> tier = optional(string, "db-custom-2-4096")<br/> version = optional(string, "POSTGRES_15")<br/> password = string<br/> username = optional(string, "materialize")<br/> db_name = optional(string, "materialize")<br/> })</pre> | n/a | yes |
152-
| <a name="input_disk_support_config"></a> [disk\_support\_config](#input\_disk\_support\_config) | Advanced configuration for disk support (only used when enable\_disk\_support = true) | <pre>object({<br/> install_openebs = optional(bool, true)<br/> run_disk_setup_script = optional(bool, true)<br/> local_ssd_count = optional(number, 1)<br/> create_storage_class = optional(bool, true)<br/> openebs_version = optional(string, "4.2.0")<br/> openebs_namespace = optional(string, "openebs")<br/> storage_class_name = optional(string, "openebs-lvm-instance-store-ext4")<br/> storage_class_provisioner = optional(string, "local.csi.openebs.io")<br/> storage_class_parameters = optional(object({<br/> storage = optional(string, "lvm")<br/> fsType = optional(string, "ext4")<br/> volgroup = optional(string, "instance-store-vg")<br/> }), {})<br/> })</pre> | `{}` | no |
154+
| <a name="input_disk_support_config"></a> [disk\_support\_config](#input\_disk\_support\_config) | Advanced configuration for disk support (only used when enable\_disk\_support = true) | <pre>object({<br/> install_openebs = optional(bool, true)<br/> run_disk_setup_script = optional(bool, true)<br/> local_ssd_count = optional(number, 1)<br/> create_storage_class = optional(bool, true)<br/> openebs_version = optional(string, "4.2.0")<br/> openebs_namespace = optional(string, "openebs")<br/> storage_class_name = optional(string, "openebs-lvm-instance-store-ext4")<br/> storage_class_provisioner = optional(string, "local.csi.openebs.io")<br/> storage_class_parameters = optional(object({<br/> storage = optional(string, "lvm")<br/> volgroup = optional(string, "instance-store-vg")<br/> }), {})<br/> })</pre> | `{}` | no |
153155
| <a name="input_enable_disk_support"></a> [enable\_disk\_support](#input\_enable\_disk\_support) | Enable disk support for Materialize using OpenEBS and local SSDs. When enabled, this configures OpenEBS, runs the disk setup script, and creates appropriate storage classes. | `bool` | `true` | no |
154156
| <a name="input_gke_config"></a> [gke\_config](#input\_gke\_config) | GKE cluster configuration. Make sure to use large enough machine types for your Materialize instances. | <pre>object({<br/> node_count = number<br/> machine_type = string<br/> disk_size_gb = number<br/> min_nodes = number<br/> max_nodes = number<br/> })</pre> | <pre>{<br/> "disk_size_gb": 100,<br/> "machine_type": "n2-highmem-8",<br/> "max_nodes": 2,<br/> "min_nodes": 1,<br/> "node_count": 1<br/>}</pre> | no |
155157
| <a name="input_helm_chart"></a> [helm\_chart](#input\_helm\_chart) | Chart name from repository or local path to chart. For local charts, set the path to the chart directory. | `string` | `"materialize-operator"` | no |

docs/header.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,14 @@ enable_disk_support = true
7474
7575
gke_config = {
7676
node_count = 3
77-
machine_type = "n2-highmem-16" # This machine has 128GB RAM
77+
# This machine has 128GB RAM
78+
machine_type = "n2-highmem-16"
7879
disk_size_gb = 100
7980
min_nodes = 3
8081
max_nodes = 5
81-
local_ssd_count = 1 # This provides 1 x 375GB = 375GB of local NVMe SSD storage
82-
# Exceeding the 2:1 disk-to-RAM ratio (128GB RAM : 375GB disk)
82+
# This provides 1 x 375GB = 375GB of local NVMe SSD storage
83+
# Exceeding the 2:1 disk-to-RAM ratio (128GB RAM : 375GB disk)
84+
local_ssd_count = 1
8385
}
8486
8587
disk_support_config = {

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ locals {
1616
storage_class_provisioner = lookup(var.disk_support_config, "storage_class_provisioner", "local.csi.openebs.io")
1717
storage_class_parameters = {
1818
storage = try(var.disk_support_config.storage_class_parameters.storage, "lvm")
19-
fsType = try(var.disk_support_config.storage_class_parameters.fsType, "ext4")
19+
fsType = "ext4"
2020
volgroup = try(var.disk_support_config.storage_class_parameters.volgroup, "instance-store-vg")
2121
}
2222
}

modules/gke/bootstrap.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ echo "Starting GCP NVMe SSD setup"
66
# Install required tools
77
if command -v apt-get >/dev/null 2>&1; then
88
apt-get update
9-
apt-get install -y lvm2
9+
apt-get install -y lvm2=2.03.11-2.1
1010
elif command -v yum >/dev/null 2>&1; then
11-
yum install -y lvm2
11+
yum install -y lvm2-2.03.11-5.el9
1212
else
1313
echo "No package manager found. Please install required tools manually."
1414
exit 1

modules/gke/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ resource "kubernetes_daemonset" "disk_setup" {
243243

244244
init_container {
245245
name = "disk-setup"
246-
image = "debian:bullseye-slim"
246+
image = "debian:bullseye-20250407-slim"
247247

248248
command = ["/bin/bash", "/scripts/bootstrap.sh"]
249249

variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ variable "disk_support_config" {
223223
storage_class_provisioner = optional(string, "local.csi.openebs.io")
224224
storage_class_parameters = optional(object({
225225
storage = optional(string, "lvm")
226-
fsType = optional(string, "ext4")
227226
volgroup = optional(string, "instance-store-vg")
228227
}), {})
229228
})

0 commit comments

Comments
 (0)