Skip to content

Commit 73793d9

Browse files
Merge pull request #6951 from zalando-incubator/dev-to-kube-1.26
dev to kube-1.26
2 parents c728643 + 25b2028 commit 73793d9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cluster/config-defaults.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ cluster_autoscaler_max_graceful_termination_sec: "1209600" # 2 weeks
2828
cluster_autoscaler_max_usnchedulable_pods_considered: "1000"
2929

3030
# karpenter settings
31-
karpenter_controller_cpu: "170m"
32-
karpenter_controller_memory: "250Mi"
31+
karpenter_controller_cpu: "25m"
32+
karpenter_controller_memory: "100Mi"
3333
# set log level of karpenter: error|debug
3434
karpenter_log_level: "error"
3535

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $internal_version := "v0.19.44-795" }}
2-
{{ $canary_internal_version := "v0.19.44-795" }}
2+
{{ $canary_internal_version := "v0.19.53-804" }}
33

44
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
55
{{ $canary_args := "" }}

0 commit comments

Comments
 (0)