Add feature gates to settings (#47)

* add featureGate option to helm chart

* update usage example

* optional dynamic settings

* remove removed var

* use additional_settings for featureGates and more

* update readme source

* v0.35+ drops the v

* move additional_settings to be lowest priority in merge

* added indent

---------

Co-authored-by: Igor Rodionov <[email protected]>

Author: seanlongnyc

README.md

@@ -27,7 +27,7 @@ usage: |-
           # https://github.com/aws/karpenter/tree/main/charts/karpenter
           chart_repository: "oci://public.ecr.aws/karpenter"
           chart: "karpenter"
-          chart_version: "v0.36.0"
+          chart_version: "1.6.0"
           # Enable Karpenter to get advance notice of spot instances being terminated
           # See https://karpenter.sh/docs/concepts/#interruption
           interruption_handler_enabled: true
@@ -41,7 +41,6 @@ usage: |-
           cleanup_on_fail: true
           atomic: true
           wait: true
-          rbac_enabled: true
           # "karpenter-crd" can be installed as an independent helm chart to manage the lifecycle of Karpenter CRDs
           crd_chart_enabled: true
           crd_chart: "karpenter-crd"
@@ -52,6 +51,12 @@ usage: |-
           settings:
             batch_idle_duration: "1s"
             batch_max_duration: "10s"
+          # (Optional) "settings" which do not have an explicit mapping and may be subject to change between helm chart versions
+          additional_settings:
+            featureGates:
+              nodeRepair: false
+              reservedCapacity: true
+              spotToSpotConsolidation: true
           # The logging settings for the Karpenter controller
           logging:
             enabled: true

README.yaml

@@ -119,10 +119,12 @@ module "karpenter" {
           webhook    = var.logging.level.webhook
         }
       }
-      settings = merge({
-        batchIdleDuration = var.settings.batch_idle_duration
-        batchMaxDuration  = var.settings.batch_max_duration
-        clusterName       = local.eks_cluster_id
+      settings = merge(
+        var.additional_settings,
+        {
+          batchIdleDuration = var.settings.batch_idle_duration
+          batchMaxDuration  = var.settings.batch_max_duration
+          clusterName       = local.eks_cluster_id
         },
         local.interruption_handler_enabled ? {
           interruptionQueue = local.interruption_handler_queue_name

src/README.md

@@ -141,6 +141,27 @@ variable "settings" {
   nullable    = false
 }
 
+variable "additional_settings" {
+  type        = any
+  description = <<-EOT
+  Additional settings to merge into the Karpenter controller settings.
+  This is useful for setting featureGates or other advanced settings that may
+  vary by chart version. These settings will be merged with the base settings
+  and take precedence over any conflicting keys.
+  
+  Example:
+  additional_settings = {
+    featureGates = {
+      nodeRepair = false
+      reservedCapacity = true
+      spotToSpotConsolidation = false
+    }
+  }
+  EOT
+  default     = {}
+  nullable    = false
+}
+
 variable "logging" {
   type = object({
     enabled = optional(bool, true)

src/main.tf

@@ -24,7 +24,6 @@ components:
         cleanup_on_fail: true
         atomic: true
         wait: true
-        rbac_enabled: true
         # "karpenter-crd" can be installed as an independent helm chart to manage the lifecycle of Karpenter CRDs
         crd_chart_enabled: true
         crd_chart: "karpenter-crd"

src/variables.tf

@@ -10,7 +10,7 @@ components:
         # https://github.com/aws/karpenter/tree/main/charts/karpenter
         chart_repository: "oci://public.ecr.aws/karpenter"
         chart: "karpenter"
-        chart_version: "v0.36.0"
+        chart_version: "0.36.0"
         # Enable Karpenter to get advance notice of spot instances being terminated
         # See https://karpenter.sh/docs/concepts/#interruption
         interruption_handler_enabled: true
@@ -24,7 +24,6 @@ components:
         cleanup_on_fail: true
         atomic: true
         wait: true
-        rbac_enabled: true
         # "karpenter-crd" can be installed as an independent helm chart to manage the lifecycle of Karpenter CRDs
         crd_chart_enabled: true
         crd_chart: "karpenter-crd"

test/fixtures/stacks/catalog/usecase/basic.yaml

@@ -0,0 +1,49 @@
+components:
+  terraform:
+    eks/karpenter-controller/basic:
+      metadata:
+        component: eks/karpenter-controller
+      vars:
+        enabled: true
+        kube_exec_auth_role_arn_enabled: false
+        name: "karpenter"
+        # https://github.com/aws/karpenter/tree/main/charts/karpenter
+        chart_repository: "oci://public.ecr.aws/karpenter"
+        chart: "karpenter"
+        chart_version: "1.6.0"
+        # Enable Karpenter to get advance notice of spot instances being terminated
+        # See https://karpenter.sh/docs/concepts/#interruption
+        interruption_handler_enabled: true
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "512Mi"
+          requests:
+            cpu: "100m"
+            memory: "512Mi"
+        cleanup_on_fail: true
+        atomic: true
+        wait: true
+        # "karpenter-crd" can be installed as an independent helm chart to manage the lifecycle of Karpenter CRDs
+        crd_chart_enabled: true
+        crd_chart: "karpenter-crd"
+        # replicas set the number of Karpenter controller replicas to run
+        replicas: 2
+        # "settings" controls a subset of the settings for the Karpenter controller regarding batch idle and max duration.
+        # you can read more about these settings here: https://karpenter.sh/docs/reference/settings/
+        settings:
+          batch_idle_duration: "1s"
+          batch_max_duration: "10s"
+        # "additional_settings" allows for chart version-specific settings like featureGates
+        additional_settings:
+          featureGates:
+            nodeRepair: false
+            reservedCapacity: true
+            spotToSpotConsolidation: true
+        # The logging settings for the Karpenter controller
+        logging:
+          enabled: true
+          level:
+            controller: "info"
+            global: "info"
+            webhook: "error"