Skip to content

Commit 900c8bb

Browse files
njtrannjtran
committed
chore: update gomod for cherrypick
1 parent 6528a39 commit 900c8bb

8 files changed

+27
-81
lines changed

‎charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml

+8-37
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: ec2nodeclasses.karpenter.k8s.aws
88
spec:
99
group: karpenter.k8s.aws
@@ -162,24 +162,18 @@ spec:
162162
gp2 volumes, this represents the baseline performance of the volume and the
163163
rate at which the volume accumulates I/O credits for bursting.
164164
165-
166165
The following are the supported values for each volume type:
167166
168-
169167
* gp3: 3,000-16,000 IOPS
170168
171-
172169
* io1: 100-64,000 IOPS
173170
174-
175171
* io2: 100-64,000 IOPS
176172
177-
178173
For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built
179174
on the Nitro System (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances).
180175
Other instance families guarantee performance up to 32,000 IOPS.
181176
182-
183177
This parameter is supported for io1, io2, and gp3 volumes only. This parameter
184178
is not supported for gp2, st1, sc1, or standard volumes.
185179
format: int64
@@ -202,16 +196,12 @@ spec:
202196
a volume size. The following are the supported volumes sizes for each volume
203197
type:
204198
205-
206199
* gp2 and gp3: 1-16,384
207200
208-
209201
* io1 and io2: 4-16,384
210202
211-
212203
* st1 and sc1: 125-16,384
213204
214-
215205
* standard: 1-1,024
216206
pattern: ^((?:[1-9][0-9]{0,3}|[1-4][0-9]{4}|[5][0-8][0-9]{3}|59000)Gi|(?:[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-3][0-9]{3}|64000)G|([1-9]||[1-5][0-7]|58)Ti|([1-9]||[1-5][0-9]|6[0-3]|64)T)$
217207
type: string
@@ -238,6 +228,9 @@ spec:
238228
RootVolume is a flag indicating if this device is mounted as kubelet root dir. You can
239229
configure at most one root volume in BlockDeviceMappings.
240230
type: boolean
231+
required:
232+
- deviceName
233+
- ebs
241234
type: object
242235
maxItems: 50
243236
type: array
@@ -390,14 +383,12 @@ spec:
390383
description: |-
391384
MetadataOptions for the generated launch template of provisioned nodes.
392385
393-
394386
This specifies the exposure of the Instance Metadata Service to
395387
provisioned EC2 nodes. For more information,
396388
see Instance Metadata and User Data
397389
(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html)
398390
in the Amazon Elastic Compute Cloud User Guide.
399391
400-
401392
Refer to recommended, security best practices
402393
(https://aws.github.io/aws-eks-best-practices/security/docs/iam/#restrict-access-to-the-instance-profile-assigned-to-the-worker-node)
403394
for limiting exposure of Instance Metadata and User Data to pods.
@@ -412,7 +403,6 @@ spec:
412403
nodes. If metadata options is non-nil, but this parameter is not specified,
413404
the default state is "enabled".
414405
415-
416406
If you specify a value of "disabled", instance metadata will not be accessible
417407
on the node.
418408
enum:
@@ -448,14 +438,12 @@ spec:
448438
requests. If metadata options is non-nil, but this parameter is not
449439
specified, the default state is "required".
450440
451-
452441
If the state is optional, one can choose to retrieve instance metadata with
453442
or without a signed token header on the request. If one retrieves the IAM
454443
role credentials without a token, the version 1.0 role credentials are
455444
returned. If one retrieves the IAM role credentials using a valid signed
456445
token, the version 2.0 role credentials are returned.
457446
458-
459447
If the state is "required", one must send a signed token header with any
460448
instance metadata retrieval requests. In this state, retrieving the IAM
461449
role credentials always returns the version 2.0 credentials; the version
@@ -691,12 +679,7 @@ spec:
691679
- Unknown
692680
type: string
693681
type:
694-
description: |-
695-
type of condition in CamelCase or in foo.example.com/CamelCase.
696-
---
697-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
698-
useful (see .node.status.conditions), the ability to deconflict is important.
699-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
682+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
700683
maxLength: 316
701684
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
702685
type: string
@@ -862,24 +845,18 @@ spec:
862845
gp2 volumes, this represents the baseline performance of the volume and the
863846
rate at which the volume accumulates I/O credits for bursting.
864847
865-
866848
The following are the supported values for each volume type:
867849
868-
869850
* gp3: 3,000-16,000 IOPS
870851
871-
872852
* io1: 100-64,000 IOPS
873853
874-
875854
* io2: 100-64,000 IOPS
876855
877-
878856
For io1 and io2 volumes, we guarantee 64,000 IOPS only for Instances built
879857
on the Nitro System (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances).
880858
Other instance families guarantee performance up to 32,000 IOPS.
881859
882-
883860
This parameter is supported for io1, io2, and gp3 volumes only. This parameter
884861
is not supported for gp2, st1, sc1, or standard volumes.
885862
format: int64
@@ -908,16 +885,12 @@ spec:
908885
a volume size. The following are the supported volumes sizes for each volume
909886
type:
910887
911-
912888
* gp2 and gp3: 1-16,384
913889
914-
915890
* io1 and io2: 4-16,384
916891
917-
918892
* st1 and sc1: 125-16,384
919893
920-
921894
* standard: 1-1,024
922895
x-kubernetes-int-or-string: true
923896
volumeType:
@@ -943,6 +916,9 @@ spec:
943916
RootVolume is a flag indicating if this device is mounted as kubelet root dir. You can
944917
configure at most one root volume in BlockDeviceMappings.
945918
type: boolean
919+
required:
920+
- deviceName
921+
- ebs
946922
type: object
947923
maxItems: 50
948924
type: array
@@ -981,14 +957,12 @@ spec:
981957
description: |-
982958
MetadataOptions for the generated launch template of provisioned nodes.
983959
984-
985960
This specifies the exposure of the Instance Metadata Service to
986961
provisioned EC2 nodes. For more information,
987962
see Instance Metadata and User Data
988963
(https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html)
989964
in the Amazon Elastic Compute Cloud User Guide.
990965
991-
992966
Refer to recommended, security best practices
993967
(https://aws.github.io/aws-eks-best-practices/security/docs/iam/#restrict-access-to-the-instance-profile-assigned-to-the-worker-node)
994968
for limiting exposure of Instance Metadata and User Data to pods.
@@ -1003,7 +977,6 @@ spec:
1003977
nodes. If metadata options is non-nil, but this parameter is not specified,
1004978
the default state is "enabled".
1005979
1006-
1007980
If you specify a value of "disabled", instance metadata will not be accessible
1008981
on the node.
1009982
enum:
@@ -1039,14 +1012,12 @@ spec:
10391012
requests. If metadata options is non-nil, but this parameter is not
10401013
specified, the default state is "required".
10411014
1042-
10431015
If the state is optional, one can choose to retrieve instance metadata with
10441016
or without a signed token header on the request. If one retrieves the IAM
10451017
role credentials without a token, the version 1.0 role credentials are
10461018
returned. If one retrieves the IAM role credentials using a valid signed
10471019
token, the version 2.0 role credentials are returned.
10481020
1049-
10501021
If the state is "required", one must send a signed token header with any
10511022
instance metadata retrieval requests. In this state, retrieving the IAM
10521023
role credentials always returns the version 2.0 credentials; the version

‎charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.2
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: nodeclaims.karpenter.sh
88
spec:
99
group: karpenter.sh

‎charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.2
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: nodepools.karpenter.sh
88
spec:
99
group: karpenter.sh
@@ -71,6 +71,8 @@ spec:
7171
from a combination of nodepool and pod scheduling constraints.
7272
properties:
7373
disruption:
74+
default:
75+
consolidateAfter: 0s
7476
description: Disruption contains the parameters that relate to Karpenter's disruption logic
7577
properties:
7678
budgets:

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
3030
knative.dev/pkg v0.0.0-20231010144348-ca8c009405dd
3131
sigs.k8s.io/controller-runtime v0.18.4
32-
sigs.k8s.io/karpenter v0.36.5
32+
sigs.k8s.io/karpenter v0.36.6-0.20240917214243-bdba3842cb5f
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -761,8 +761,8 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv
761761
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
762762
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
763763
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
764-
sigs.k8s.io/karpenter v0.36.5 h1:e1KvcVQdw4KmV9OBOlXzt4OBLvqntehUPfRRkv2G0/w=
765-
sigs.k8s.io/karpenter v0.36.5/go.mod h1:vZfbuD5UQJfNdaNwiUVgCUJ/yYOVjYbKosr8b971CAM=
764+
sigs.k8s.io/karpenter v0.36.6-0.20240917214243-bdba3842cb5f h1:9xr/4TZWXkV5E7Cf0wetY1M7cZUWzjgvvR9KdPII1GM=
765+
sigs.k8s.io/karpenter v0.36.6-0.20240917214243-bdba3842cb5f/go.mod h1:vZfbuD5UQJfNdaNwiUVgCUJ/yYOVjYbKosr8b971CAM=
766766
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
767767
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
768768
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

0 commit comments

Comments
 (0)