Merge pull request #15 from fiverr/DO-759-fix-expireafter

fix expire after placement according to updated spec
fiverr · Aug 15, 2024 · f01a704 · f01a704
2 parents a8a7c6c + b9a5ffb
commit f01a704
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/charts/karpenter_nodes/Chart.yaml b/charts/karpenter_nodes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: karpenter_nodes
-version: 1.1.0
+version: 1.1.1
 description: A Helm chart for generating NodeClasses and NodePools for Karpenter
 maintainers:
   - name: nadavbuc
diff --git a/charts/karpenter_nodes/templates/nodepool.yaml b/charts/karpenter_nodes/templates/nodepool.yaml
@@ -151,8 +151,8 @@ spec:
         {{- if or (hasKey $.Values "additionalRequirements") (hasKey $v "additionalRequirements") }}
         {{- toYaml ($v.additionalRequirements | default $.Values.additionalRequirements) | nindent 8 }}
         {{- end }}
+      expireAfter: {{ $v.expireAfter | default $.Values.expireAfter }}
   disruption:
-    expireAfter: {{ $v.expireAfter | default $.Values.expireAfter }}
     consolidationPolicy: {{$v.consolidationPolicy | default $.Values.consolidationPolicy}}
     {{- if eq ($v.consolidationPolicy | default $.Values.consolidationPolicy) "WhenEmpty" }}
     consolidateAfter: {{ $v.consolidateAfter | default $.Values.consolidateAfter }}

diff --git a/charts/karpenter_nodes/tests/nodepool_nodes_default_test.yaml b/charts/karpenter_nodes/tests/nodepool_nodes_default_test.yaml
@@ -131,7 +131,7 @@ tests:
     documentIndex: 0
     asserts:
       - equal:
-          path: spec.disruption.expireAfter
+          path: spec.template.spec.expireAfter
           value: 720h
       - equal:
           path: spec.disruption.consolidationPolicy

diff --git a/charts/karpenter_nodes/tests/nodepool_nodes_workers_test.yaml b/charts/karpenter_nodes/tests/nodepool_nodes_workers_test.yaml
@@ -163,7 +163,7 @@ tests:
     documentIndex: 3
     asserts:
       - equal:
-          path: spec.disruption.expireAfter
+          path: spec.template.spec.expireAfter
           value: 720h
       - equal:
           path: spec.disruption.consolidationPolicy