Skip to content

Commit 552976a

Browse files
authored
Merge pull request #9289 from zalando-incubator/dev-to-kube-1.32
dev to kube-1.32
2 parents 7b5f35d + b776c9e commit 552976a

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

cluster/config-defaults.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ karpenter_instance_storage_raid0: "true"
4747
# Can be set cluster wide or per node pool
4848
karpenter_in_transit_support_required: "false"
4949

50+
# configure whether we allow t instance families for Karpenter nodes
51+
# t type instances have burstable CPU, which can be undesirable in production
52+
karpenter_instance_family_t_enabled: "false"
53+
5054
# ALB config created by kube-aws-ingress-controller
5155
kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS-1-2-2017-01"
5256
kube_aws_ingress_controller_idle_timeout: "1m"

cluster/manifests/zalando-iam-aws-proxy/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: zalando-iam-aws-proxy
2828
containers:
2929
- name: proxy
30-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/zalando-iam-aws-proxy:main-1
30+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/zalando-iam-aws-proxy:main-2
3131
args:
3232
- "--apiserver-url=https://kubernetes.default.svc.cluster.local"
3333
- "--ca-file-path=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"

cluster/node-pools/worker-karpenter/provisioners.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,13 @@ spec:
157157
values:
158158
# the ARM architecture is too old and flannel breaks
159159
- "a1"
160+
#{{ if eq .Cluster.ConfigItems.karpenter_instance_family_t_enabled "false"}}
161+
# t type instances have burstable CPU, undesired in production
162+
- "t4g"
163+
- "t3a"
164+
- "t3"
165+
- "t2"
166+
#{{ end }}
160167
#{{ if eq .NodePool.ConfigItems.karpenter_in_transit_support_required "true" }}
161168
- key: karpenter.k8s.aws/instance-encryption-in-transit-supported
162169
operator: In

0 commit comments

Comments
 (0)