From dde6003618b5342e752561586608e598193ba430 Mon Sep 17 00:00:00 2001
From: mglotov <37855803+mglotov@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:46:28 +0600
Subject: [PATCH] update karpenter to the latest version (#357)

Co-authored-by: Max Glotov <max@maddevs.io>
---
 terraform/modules/k8s-karpenter/main.tf       | 12 +++++++-----
 terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml | 14 ++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/terraform/modules/k8s-karpenter/main.tf b/terraform/modules/k8s-karpenter/main.tf
index 897abe8..f9f4dec 100644
--- a/terraform/modules/k8s-karpenter/main.tf
+++ b/terraform/modules/k8s-karpenter/main.tf
@@ -5,7 +5,7 @@ locals {
     enabled       = true
     chart         = try(var.helm.chart_name, "karpenter")
     repository    = try(var.helm.repository, "oci://public.ecr.aws/karpenter")
-    chart_version = try(var.helm.chart_version, "0.37.0")
+    chart_version = try(var.helm.chart_version, "1.0.0")
     namespace     = try(var.helm.namespace, "karpenter")
   }
 
@@ -66,13 +66,14 @@ resource "kubectl_manifest" "ec2nodeclass_private" {
   count = local.karpenter.enabled ? 1 : 0
 
   yaml_body = <<EOF
-apiVersion: karpenter.k8s.aws/v1beta1
+apiVersion: karpenter.sh/v1
 kind: EC2NodeClass
 metadata:
   name: private
   namespace: ${local.karpenter.namespace}
 spec:
-  amiFamily: AL2023 # Amazon Linux 2023
+  amiSelectorTerms:
+    - alias: al2023@latest
   role: ${var.node_group_default_iam_role_name} # replace with your cluster name NODE ROLE ID from the aws-eks
   subnetSelectorTerms:
     - tags:
@@ -97,13 +98,14 @@ resource "kubectl_manifest" "ec2nodeclass_public" {
   count = local.karpenter.enabled ? 1 : 0
 
   yaml_body = <<EOF
-apiVersion: karpenter.k8s.aws/v1beta1
+apiVersion: karpenter.sh/v1
 kind: EC2NodeClass
 metadata:
   name: public
   namespace: ${local.karpenter.namespace}
 spec:
-  amiFamily: AL2023 # Amazon Linux 2023
+  amiSelectorTerms:
+    - alias: al2023@latest
   role: ${var.node_group_default_iam_role_name} # replace with your cluster name NODE ROLE ID from the aws-base
   subnetSelectorTerms:
     - tags:
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml
index c901438..f393b10 100644
--- a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml
+++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml
@@ -16,7 +16,7 @@ single_nat_gateway: true
 eks_cluster_version: "1.30"
 
 eks_karpenter_nodepools:
-  - apiVersion: karpenter.sh/v1beta1
+  - apiVersion: karpenter.sh/v1
     kind: NodePool
     metadata:
       name: default
@@ -64,15 +64,16 @@ eks_karpenter_nodepools:
             imageGCLowThresholdPercent: 80
             cpuCFSQuota: true
 
+      expireAfter: 720h
+
       disruption:
-        consolidationPolicy: WhenUnderutilized
-        expireAfter: 720h
+        consolidationPolicy: WhenEmptyOrUnderutilized
 
       limits:
         cpu: "1000"
         memory: 1000Gi
 
-  - apiVersion: karpenter.sh/v1beta1
+  - apiVersion: karpenter.sh/v1
     kind: NodePool
     metadata:
       name: ci
@@ -125,9 +126,10 @@ eks_karpenter_nodepools:
             imageGCLowThresholdPercent: 80
             cpuCFSQuota: true
 
+      expireAfter: 720h
+
       disruption:
-        consolidationPolicy: WhenUnderutilized
-        expireAfter: 720h
+        consolidationPolicy: WhenEmptyOrUnderutilized
 
       limits:
         cpu: "1000"