Skip to content

Commit 71188eb

Browse files
authored
Merge pull request #6993 from zalando-incubator/dev-to-kube-1.26
dev to kube-1.26
2 parents 0db0a26 + 9da1106 commit 71188eb

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

cluster/config-defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cluster_autoscaler_max_usnchedulable_pods_considered: "1000"
2929

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

cluster/manifests/stackset-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ $version := "v1.4.36" }}
1+
{{ $version := "v1.4.38" }}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:

cluster/manifests/z-karpenter/vpa.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
{{ range $NodePool := .Cluster.NodePools}}
2626
{{ if eq $NodePool.Name "default-master" }}
2727
# Scaling is relative to r6g.large (smallest master node)
28-
# 0.016 -> ~250Mi memory, 0.027 -> ~50m CPU
29-
memory: {{ scaleQuantity (instanceTypeMemoryQuantity (index .InstanceTypes 0)) 0.016 }}
28+
# 0.064 -> ~1024Mi memory, 0.027 -> ~50m CPU
29+
memory: {{ scaleQuantity (instanceTypeMemoryQuantity (index .InstanceTypes 0)) 0.064 }}
3030
cpu: {{ scaleQuantity (instanceTypeCPUQuantity (index .InstanceTypes 0)) 0.027 }}
3131
{{ end }}
3232
{{ end }}

cluster/node-pools/master-default/userdata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ write_files:
202202
limits:
203203
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
204204
{{- end }}
205-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-192
205+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-191
206206
name: admission-controller
207207
lifecycle:
208208
preStop:

test/e2e/stackset/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22
44

55
toolchain go1.22.0
66

7-
require github.com/zalando-incubator/stackset-controller v1.4.36
7+
require github.com/zalando-incubator/stackset-controller v1.4.38
88

99
require (
1010
github.com/beorn7/perks v1.0.1 // indirect

test/e2e/stackset/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
506506
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
507507
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
508508
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
509-
github.com/zalando-incubator/stackset-controller v1.4.36 h1:m9Zq+1RN6wDs+eDniaMTsfISR2iHOvZBKRk8gd/fOZM=
510-
github.com/zalando-incubator/stackset-controller v1.4.36/go.mod h1:cs6DeHcxl4xAAXl5pK1oAoxjKbmp10PBLKqYqw21VxI=
509+
github.com/zalando-incubator/stackset-controller v1.4.38 h1:3QkwkuG1y1LZD18j99OU8hM5oLBnRFdvmN/izwRztls=
510+
github.com/zalando-incubator/stackset-controller v1.4.38/go.mod h1:cs6DeHcxl4xAAXl5pK1oAoxjKbmp10PBLKqYqw21VxI=
511511
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
512512
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
513513
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=

0 commit comments

Comments
 (0)