Skip to content

Commit

Permalink
chore: bump karpenter-core to include CEL validation (#4748)
Browse files Browse the repository at this point in the history
  • Loading branch information
engedaam committed Oct 4, 2023
1 parent d4d9360 commit 50687e2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -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=
Expand Down
8 changes: 8 additions & 0 deletions pkg/apis/crds/karpenter.sh_nodepools.yaml
Expand Up @@ -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:
Expand Down

0 comments on commit 50687e2

Please sign in to comment.