Merge pull request #90 from MaterializeInc/swap_follow_up_improvements_part2

alex-hunt-materialize · web-flow · commit 9eff627ae4eb · 2025-11-25T14:30:34.000Z
Swap follow up improvements part2
diff --git a/README.md b/README.md
@@ -142,11 +142,9 @@ These flags configure default limits for clusters, connections, and tables. You
 | <a name="input_db_instance_class"></a> [db\_instance\_class](#input\_db\_instance\_class) | Instance class for the RDS instance. This is used for concensus and metadata and is general not bottlnecked by memory or disk. Recomended instance family m7i, m6i, m7g, and m8g | `string` | `"db.m6i.large"` | no |
 | <a name="input_db_max_allocated_storage"></a> [db\_max\_allocated\_storage](#input\_db\_max\_allocated\_storage) | Maximum storage for autoscaling (in GB) | `number` | `100` | no |
 | <a name="input_db_multi_az"></a> [db\_multi\_az](#input\_db\_multi\_az) | Enable multi-AZ deployment for RDS | `bool` | `false` | no |
-| <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/>    create_storage_class      = optional(bool, true)<br/>    openebs_version           = optional(string, "4.3.3")<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 |
 | <a name="input_enable_bucket_encryption"></a> [enable\_bucket\_encryption](#input\_enable\_bucket\_encryption) | Enable server-side encryption for the S3 bucket | `bool` | `true` | no |
 | <a name="input_enable_bucket_versioning"></a> [enable\_bucket\_versioning](#input\_enable\_bucket\_versioning) | Enable versioning for the S3 bucket | `bool` | `true` | no |
 | <a name="input_enable_cluster_creator_admin_permissions"></a> [enable\_cluster\_creator\_admin\_permissions](#input\_enable\_cluster\_creator\_admin\_permissions) | To add the current caller identity as an administrator | `bool` | `true` | no |
-| <a name="input_enable_disk_support"></a> [enable\_disk\_support](#input\_enable\_disk\_support) | Enable disk support for Materialize using OpenEBS and NVMe instance storage. When enabled, this configures OpenEBS, runs the disk setup script for NVMe devices, and creates appropriate storage classes. | `bool` | `true` | no |
 | <a name="input_enable_monitoring"></a> [enable\_monitoring](#input\_enable\_monitoring) | Enable CloudWatch monitoring | `bool` | `true` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | Environment name (e.g., prod, staging, dev) | `string` | n/a | yes |
 | <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 |
@@ -231,6 +229,15 @@ More advanced TLS support using user-provided CAs or per-Materialize `Issuer`s a
 
 ## Upgrade Notes
 
+#### v0.8.0
+
+You must upgrade to at least v0.7.x before upgrading to v0.8.x of this terraform code.
+
+Breaking changes:
+* The system node group is renamed and significantly modified, forcing a recreation.
+* Both node groups are now locked to Bottlerocket AMIs and ON\_DEMAND scheduling.
+* Openebs is removed, and with it all support for lgalloc, our legacy spill to disk mechanism.
+
 #### v0.7.0
 
 This is an intermediate version to handle some changes that must be applied in stages.
diff --git a/docs/footer.md b/docs/footer.md
@@ -25,6 +25,15 @@ More advanced TLS support using user-provided CAs or per-Materialize `Issuer`s a
 
 ## Upgrade Notes
 
+#### v0.8.0
+
+You must upgrade to at least v0.7.x before upgrading to v0.8.x of this terraform code.
+
+Breaking changes:
+* The system node group is renamed and significantly modified, forcing a recreation.
+* Both node groups are now locked to Bottlerocket AMIs and ON_DEMAND scheduling.
+* Openebs is removed, and with it all support for lgalloc, our legacy spill to disk mechanism.
+
 #### v0.7.0
 
 This is an intermediate version to handle some changes that must be applied in stages.
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -52,9 +52,9 @@ module "materialize_infrastructure" {
   # EKS Configuration
   cluster_version = "1.32"
 
-  system_node_group_instance_types = ["r7gd.2xlarge"]
+  system_node_group_instance_types = ["m7g.medium"]
   system_node_group_desired_size   = 2
-  system_node_group_min_size       = 1
+  system_node_group_min_size       = 2
   system_node_group_max_size       = 2
 
   materialize_node_group_instance_types = ["r7gd.2xlarge"]
diff --git a/main.tf b/main.tf
@@ -33,12 +33,6 @@ module "eks" {
   cluster_enabled_log_types                = var.cluster_enabled_log_types
   enable_cluster_creator_admin_permissions = var.enable_cluster_creator_admin_permissions
 
-  # We can't uninstall this until we're certain that we're no longer using it.
-  install_openebs   = local.disk_config.install_openebs
-  enable_disk_setup = local.disk_config.run_disk_setup_script
-  openebs_namespace = local.disk_config.openebs_namespace
-  openebs_version   = local.disk_config.openebs_version
-
   tags = local.common_tags
 
   depends_on = [
@@ -256,15 +250,6 @@ locals {
         }
       }
     }
-    # TODO we can't delete this until we're certain no one is using it
-    storage = var.enable_disk_support ? {
-      storageClass = {
-        create      = local.disk_config.create_storage_class
-        name        = local.disk_config.storage_class_name
-        provisioner = local.disk_config.storage_class_provisioner
-        parameters  = local.disk_config.storage_class_parameters
-      }
-    } : {}
     tls = (var.use_self_signed_cluster_issuer && length(var.materialize_instances) > 0) ? {
       defaultCertificateSpecs = {
         balancerdExternal = {
@@ -356,23 +341,6 @@ locals {
       ManagedBy   = "terraform"
     }
   )
-
-  # TODO we can't delete this until we're certain no one is using it
-  # Disk support configuration
-  disk_config = {
-    install_openebs           = var.enable_disk_support ? lookup(var.disk_support_config, "install_openebs", true) : false
-    run_disk_setup_script     = var.enable_disk_support ? lookup(var.disk_support_config, "run_disk_setup_script", true) : false
-    create_storage_class      = var.enable_disk_support ? lookup(var.disk_support_config, "create_storage_class", true) : false
-    openebs_version           = lookup(var.disk_support_config, "openebs_version", "4.3.3")
-    openebs_namespace         = lookup(var.disk_support_config, "openebs_namespace", "openebs")
-    storage_class_name        = lookup(var.disk_support_config, "storage_class_name", "openebs-lvm-instance-store-ext4")
-    storage_class_provisioner = lookup(var.disk_support_config, "storage_class_provisioner", "local.csi.openebs.io")
-    storage_class_parameters = {
-      storage  = try(var.disk_support_config.storage_class_parameters.storage, "lvm")
-      fsType   = try(var.disk_support_config.storage_class_parameters.fsType, "ext4")
-      volgroup = try(var.disk_support_config.storage_class_parameters.volgroup, "instance-store-vg")
-    }
-  }
 }
 
 resource "aws_cloudwatch_log_group" "materialize" {
diff --git a/modules/eks/main.tf b/modules/eks/main.tf
@@ -1,7 +1,5 @@
 locals {
   name_prefix = "${var.namespace}-${var.environment}"
-
-  disk_setup_script = file("${path.module}/bootstrap.sh")
 }
 
 module "eks" {
@@ -20,7 +18,7 @@ module "eks" {
   cluster_enabled_log_types = var.cluster_enabled_log_types
 
   eks_managed_node_groups = {
-    "${local.name_prefix}-mz" = {
+    "${local.name_prefix}-system" = {
       desired_size = var.node_group_desired_size
       min_size     = var.node_group_min_size
       max_size     = var.node_group_max_size
@@ -32,19 +30,10 @@ module "eks" {
       name = local.name_prefix
 
       labels = {
-        Environment                    = var.environment
-        GithubRepo                     = "materialize"
-        "materialize.cloud/disk"       = var.enable_disk_setup ? "true" : "false"
-        "materialize.cloud/scratch-fs" = var.enable_disk_setup ? "true" : "false"
-        "workload"                     = "materialize-instance"
+        Environment = var.environment
+        GithubRepo  = "materialize"
+        "workload"  = "system"
       }
-
-      cloudinit_pre_nodeadm = var.enable_disk_setup ? [
-        {
-          content_type = "text/x-shellscript"
-          content      = local.disk_setup_script
-        }
-      ] : []
     }
   }
 
@@ -84,76 +73,3 @@ module "eks" {
 
   tags = var.tags
 }
-
-# Install OpenEBS for lgalloc support
-resource "kubernetes_namespace" "openebs" {
-  count = var.install_openebs ? 1 : 0
-
-  metadata {
-    name = var.openebs_namespace
-  }
-}
-
-resource "helm_release" "openebs" {
-  count = var.install_openebs ? 1 : 0
-
-  name       = "openebs"
-  namespace  = kubernetes_namespace.openebs[0].metadata[0].name
-  repository = "https://openebs.github.io/openebs"
-  chart      = "openebs"
-  version    = var.openebs_version
-
-  values = [jsonencode({
-    "alloy" : {
-      "enabled" : false,
-    },
-    "localpv-provisioner" : {
-      "localpv" : {
-        "enabled" : false,
-      },
-      "hostpathClass" : {
-        "enabled" : false,
-      },
-      "serviceAccount" : {
-        "create" : false,
-      },
-    },
-    "zfs-localpv" : {
-      "enabled" : false,
-    },
-    "loki" : {
-      "enabled" : false,
-    },
-    "mayastor" : {
-      "enabled" : false,
-    },
-    "minio" : {
-      "enabled" : false,
-    },
-    "lvm-localpv" : {
-      "analytics" : {
-        "enabled" : false,
-      },
-      "lvmNode" : {
-        "nodeSelector" : {
-          "materialize.cloud/scratch-fs" : "true",
-          "workload" : "materialize-instance",
-        },
-      },
-    },
-    "engines" : {
-      "local" : {
-        "zfs" : {
-          "enabled" : false,
-        },
-      },
-      "replicated" : {
-        "mayastor" : {
-          "enabled" : false,
-        },
-      },
-    },
-  })]
-
-  depends_on = [kubernetes_namespace.openebs]
-}
diff --git a/modules/eks/variables.tf b/modules/eks/variables.tf
@@ -46,7 +46,7 @@ variable "node_group_instance_types" {
 variable "node_group_ami_type" {
   description = "AMI type for the node group"
   type        = string
-  default     = "AL2023_ARM_64_STANDARD"
+  default     = "BOTTLEROCKET_ARM_64"
 }
 
 variable "cluster_enabled_log_types" {
@@ -72,28 +72,3 @@ variable "enable_cluster_creator_admin_permissions" {
   type        = bool
   default     = true
 }
-
-# OpenEBS configuration
-variable "install_openebs" {
-  description = "Whether to install OpenEBS for NVMe storage"
-  type        = bool
-  default     = true
-}
-
-variable "openebs_namespace" {
-  description = "Namespace for OpenEBS components"
-  type        = string
-  default     = "openebs"
-}
-
-variable "openebs_version" {
-  description = "Version of OpenEBS Helm chart to install"
-  type        = string
-  default     = "4.3.3"
-}
-
-variable "enable_disk_setup" {
-  description = "Whether to enable disk setup using the bootstrap script"
-  type        = bool
-  default     = true
-}
diff --git a/variables.tf b/variables.tf
@@ -409,28 +409,3 @@ variable "install_metrics_server" {
   type        = bool
   default     = true
 }
-
-variable "enable_disk_support" {
-  description = "Enable disk support for Materialize using OpenEBS and NVMe instance storage. When enabled, this configures OpenEBS, runs the disk setup script for NVMe devices, and creates appropriate storage classes."
-  type        = bool
-  default     = true
-}
-
-variable "disk_support_config" {
-  description = "Advanced configuration for disk support (only used when enable_disk_support = true)"
-  type = object({
-    install_openebs           = optional(bool, true)
-    run_disk_setup_script     = optional(bool, true)
-    create_storage_class      = optional(bool, true)
-    openebs_version           = optional(string, "4.3.3")
-    openebs_namespace         = optional(string, "openebs")
-    storage_class_name        = optional(string, "openebs-lvm-instance-store-ext4")
-    storage_class_provisioner = optional(string, "local.csi.openebs.io")
-    storage_class_parameters = optional(object({
-      storage  = optional(string, "lvm")
-      fsType   = optional(string, "ext4")
-      volgroup = optional(string, "instance-store-vg")
-    }), {})
-  })
-  default = {}
-}
