From cf27e96f54f5896d3ae9cb0dedbed2449f30bd65 Mon Sep 17 00:00:00 2001
From: yubingjiaocn <yubingjiaocn@gmail.com>
Date: Mon, 18 Nov 2024 08:41:33 +0000
Subject: [PATCH] Update karpenter spec to v1

---
 src/charts/sd_on_eks/templates/nodeclass.yaml |  4 ++--
 src/charts/sd_on_eks/templates/nodepool.yaml  | 16 ++++++++--------
 utils/bottlerocket-images-cache               |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/charts/sd_on_eks/templates/nodeclass.yaml b/src/charts/sd_on_eks/templates/nodeclass.yaml
index cad3bd3..1b55ef0 100644
--- a/src/charts/sd_on_eks/templates/nodeclass.yaml
+++ b/src/charts/sd_on_eks/templates/nodeclass.yaml
@@ -1,7 +1,7 @@
-apiVersion: karpenter.k8s.aws/v1beta1
+apiVersion: karpenter.k8s.aws/v1
 kind: EC2NodeClass
 metadata:
-  name: {{ include "sdchart.fullname" . }}-nodetemplate-gpu
+  name: {{ include "sdchart.fullname" . }}-nodeclass-gpu
   labels:
   {{- include "sdchart.labels" . | nindent 4 }}
   {{- if .Values.runtime.labels }}
diff --git a/src/charts/sd_on_eks/templates/nodepool.yaml b/src/charts/sd_on_eks/templates/nodepool.yaml
index b28d292..f081cad 100644
--- a/src/charts/sd_on_eks/templates/nodepool.yaml
+++ b/src/charts/sd_on_eks/templates/nodepool.yaml
@@ -1,7 +1,7 @@
-apiVersion: karpenter.sh/v1beta1
+apiVersion: karpenter.sh/v1
 kind: NodePool
 metadata:
-  name: {{ include "sdchart.fullname" . }}-provisioner-gpu
+  name: {{ include "sdchart.fullname" . }}-nodepool-gpu
   labels:
   {{- include "sdchart.labels" . | nindent 4 }}
   {{- if .Values.runtime.labels }}
@@ -20,9 +20,9 @@ spec:
       {{- end }}
     spec:
       nodeClassRef:
-        apiVersion: karpenter.k8s.aws/v1beta1
+        group: karpenter.k8s.aws
         kind: EC2NodeClass
-        name: {{ include "sdchart.fullname" . }}-nodetemplate-gpu
+        name: {{ include "sdchart.fullname" . }}-nodeclass-gpu
       taints:
       - effect: NoSchedule
         key: nvidia.com/gpu
@@ -32,6 +32,9 @@ spec:
       {{- if .Values.karpenter.provisioner.extraTaints }}
       {{- toYaml .Values.karpenter.provisioner.extraTaints | nindent 6 }}
       {{- end }}
+      {{- if .Values.karpenter.provisioner.disruption.expireAfter }}
+      expireAfter: {{ .Values.karpenter.provisioner.disruption.expireAfter }}
+      {{- end }}
       requirements:
       - key: karpenter.sh/capacity-type
         operator: In
@@ -53,14 +56,11 @@ spec:
       {{- end }}
   disruption:
     {{- if .Values.karpenter.provisioner.consolidation }}
-    consolidationPolicy: WhenUnderutilized
+    consolidationPolicy: WhenEmptyOrUnderutilized
     {{- else }}
     consolidationPolicy: WhenEmpty
     {{- end }}
-    {{- if eq .Values.karpenter.provisioner.consolidation false }}
     consolidateAfter: {{ .Values.karpenter.provisioner.disruption.consolidateAfter }}
-    expireAfter: {{ .Values.karpenter.provisioner.disruption.expireAfter }}
-    {{- end }}
   {{- if .Values.karpenter.provisioner.resourceLimits }}
   limits:
   {{- toYaml .Values.karpenter.provisioner.resourceLimits | nindent 4 }}
diff --git a/utils/bottlerocket-images-cache b/utils/bottlerocket-images-cache
index 6010262..ca20fed 160000
--- a/utils/bottlerocket-images-cache
+++ b/utils/bottlerocket-images-cache
@@ -1 +1 @@
-Subproject commit 6010262e14b2bd0fb0b39f6c934c3cb5b6e9fdeb
+Subproject commit ca20fedef8739c30cf487538bae96eee4b2396a8