From 50687e2c3b05753fb29684b13227bc8c11b09be2 Mon Sep 17 00:00:00 2001
From: Amanuel Engeda <74629455+engedaam@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:05:16 -0700
Subject: [PATCH] chore: bump karpenter-core to include CEL validation (#4748)

---
 go.mod                                    | 2 +-
 go.sum                                    | 4 ++--
 pkg/apis/crds/karpenter.sh_nodepools.yaml | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 75a20d2a3e5d..592531ff752d 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/aws/aws-sdk-go v1.45.19
-	github.com/aws/karpenter-core v0.31.1-0.20231003150228-d494b7d6d54f
+	github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b
 	github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644
 	github.com/imdario/mergo v0.3.16
 	github.com/mitchellh/hashstructure/v2 v2.0.2
diff --git a/go.sum b/go.sum
index 5dde42c6e9a1..96562ece70d4 100644
--- a/go.sum
+++ b/go.sum
@@ -55,8 +55,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/aws/aws-sdk-go v1.45.19 h1:+4yXWhldhCVXWFOQRF99ZTJ92t4DtoHROZIbN7Ujk/U=
 github.com/aws/aws-sdk-go v1.45.19/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/karpenter-core v0.31.1-0.20231003150228-d494b7d6d54f h1:yl73U8hrilKuHnGu1dqSv3H/r+3zXA0z8iJYDGbjGxE=
-github.com/aws/karpenter-core v0.31.1-0.20231003150228-d494b7d6d54f/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs=
+github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b h1:ZqqJrFe3TgONMeHzAhyenl5x583aHR4GUBukjQhsmP4=
+github.com/aws/karpenter-core v0.31.1-0.20231004155408-0e5bc1a5197b/go.mod h1:4wXCSTj97gOWkWeB4D6LjWQMoqldrI8fo4tUOAhYTDs=
 github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644 h1:M1fxGlOfvSqFYI01HL2zzvomy8e7LiTHk77KDuChWZQ=
 github.com/aws/karpenter/tools/kompat v0.0.0-20230915222222-abfbf5fa3644/go.mod h1:l/TIBsaCx/IrOr0Xvlj/cHLOf05QzuQKEZ1hx2XWmfU=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
diff --git a/pkg/apis/crds/karpenter.sh_nodepools.yaml b/pkg/apis/crds/karpenter.sh_nodepools.yaml
index f4e413f0a97e..b40c7f9a4bb0 100644
--- a/pkg/apis/crds/karpenter.sh_nodepools.yaml
+++ b/pkg/apis/crds/karpenter.sh_nodepools.yaml
@@ -79,6 +79,14 @@ spec:
                     pattern: ^(([0-9]+(s|m|h))+)|(Never)$
                     type: string
                 type: object
+                x-kubernetes-validations:
+                - message: consolidateAfter cannot be combined with consolidationPolicy=WhenUnderutilized
+                  rule: 'has(self.consolidateAfter) ? self.consolidationPolicy !=
+                    ''WhenUnderutilized'' || self.consolidateAfter == ''Never'' :
+                    true'
+                - message: consolidateAfter must be specified with consolidationPolicy=WhenEmpty
+                  rule: 'self.consolidationPolicy == ''WhenEmpty'' ? has(self.consolidateAfter)
+                    : true'
               limits:
                 additionalProperties:
                   anyOf: