Skip to content

Commit ce02edb

Browse files
authored
Merge pull request #9540 from zalando-incubator/update-karpenter-1.5
Update Karpenter to v1.5.0
2 parents ab16c38 + d448cd1 commit ce02edb

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

cluster/manifests/z-karpenter/07-karpenter.k8s.aws_ec2nodeclasses.yaml

Lines changed: 14 additions & 1 deletion
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.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: ec2nodeclasses.karpenter.k8s.aws
88
spec:
99
group: karpenter.k8s.aws
@@ -195,6 +195,17 @@ spec:
195195
Valid Range: Minimum value of 125. Maximum value of 1000.
196196
format: int64
197197
type: integer
198+
volumeInitializationRate:
199+
description: |-
200+
VolumeInitializationRate specifies the Amazon EBS Provisioned Rate for Volume Initialization,
201+
in MiB/s, at which to download the snapshot blocks from Amazon S3 to the volume. This is also known as volume
202+
initialization. Specifying a volume initialization rate ensures that the volume is initialized at a
203+
predictable and consistent rate after creation. Only allowed if SnapshotID is set.
204+
Valid Range: Minimum value of 100. Maximum value of 300.
205+
format: int32
206+
maximum: 300
207+
minimum: 100
208+
type: integer
198209
volumeSize:
199210
description: |-
200211
VolumeSize in `Gi`, `G`, `Ti`, or `T`. You must specify either a snapshot ID or
@@ -228,6 +239,8 @@ spec:
228239
x-kubernetes-validations:
229240
- message: snapshotID or volumeSize must be defined
230241
rule: has(self.snapshotID) || has(self.volumeSize)
242+
- message: snapshotID must be set when volumeInitializationRate is set
243+
rule: '!has(self.volumeInitializationRate) || (has(self.snapshotID) && self.snapshotID != '''')'
231244
rootVolume:
232245
description: |-
233246
RootVolume is a flag indicating if this device is mounted as kubelet root dir. You can

cluster/manifests/z-karpenter/08-karpenter.sh_nodeclaims.yaml

Lines changed: 1 addition & 1 deletion
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.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: nodeclaims.karpenter.sh
88
spec:
99
group: karpenter.sh

cluster/manifests/z-karpenter/09-karpenter.sh_nodepools.yaml

Lines changed: 1 addition & 1 deletion
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.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: nodepools.karpenter.sh
88
spec:
99
group: karpenter.sh

cluster/manifests/z-karpenter/deployment.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,19 @@ spec:
3030
prometheus.io/scheme: "http"
3131
prometheus.io/scrape: "true"
3232
spec:
33-
dnsPolicy: Default
3433
automountServiceAccountToken: true
3534
serviceAccountName: karpenter
3635
securityContext:
3736
fsGroup: 65532
37+
runAsNonRoot: false
38+
seccompProfile:
39+
type: RuntimeDefault
3840
priorityClassName: "{{ .Cluster.ConfigItems.system_priority_class }}"
3941
dnsPolicy: ClusterFirst
4042
containers:
4143
- name: controller
4244
securityContext:
45+
privileged: false
4346
runAsUser: 65532
4447
runAsGroup: 65532
4548
runAsNonRoot: true
@@ -50,11 +53,11 @@ spec:
5053
drop:
5154
- ALL
5255
readOnlyRootFilesystem: true
53-
image: "container-registry.zalando.net/teapot/karpenter:1.4.0-main-38.patched"
56+
image: "container-registry.zalando.net/teapot/karpenter:1.5.0-main-39.patched"
5457
imagePullPolicy: IfNotPresent
5558
env:
5659
- name: KUBERNETES_MIN_VERSION
57-
value: 1.22.0-0
60+
value: 1.19.0-0
5861
- name: AWS_REGION
5962
value: "{{ .Cluster.Region }}"
6063
- name: CLUSTER_ENDPOINT
@@ -88,13 +91,11 @@ spec:
8891
divisor: "0"
8992
resource: limits.memory
9093
- name: FEATURE_GATES
91-
value: "Drift=false,SpotToSpotConsolidation=true,NodeRepair=false"
94+
value: "ReservedCapacity=false,SpotToSpotConsolidation=true,NodeRepair=false"
9295
- name: BATCH_MAX_DURATION
9396
value: "10s"
9497
- name: BATCH_IDLE_DURATION
9598
value: "1s"
96-
- name: ASSUME_ROLE_DURATION
97-
value: "15m"
9899
- name: PREFERENCE_POLICY
99100
value: "Respect"
100101
- name: CLUSTER_NAME
@@ -153,13 +154,6 @@ spec:
153154
matchLabels:
154155
deployment: karpenter
155156
topologyKey: kubernetes.io/hostname
156-
# topologySpreadConstraints:
157-
# - labelSelector:
158-
# matchLabels:
159-
# deployment: karpenter
160-
# maxSkew: 1
161-
# topologyKey: topology.kubernetes.io/zone
162-
# whenUnsatisfiable: ScheduleAnyway
163157
tolerations:
164158
- key: CriticalAddonsOnly
165159
operator: Exists

0 commit comments

Comments
 (0)