Skip to content

Commit 701896d

Browse files
authored
Merge pull request #9259 from zalando-incubator/dev-to-kube-1.32
dev to kube-1.32
2 parents 9bd8baf + a14c917 commit 701896d

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

cluster/config-defaults.yaml

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

3030
# karpenter settings
31-
# DO NOT SET TO FALSE IF THE CLUSTER HAS KARPENTER POOLS OR NODES. REFER TO TEAPOT DOCS FOR HOW TO ROLLBACK KARPENTER
32-
# https://teapot.docs.zalando.net/howtos/karpenter-operations/
33-
karpenter_pools_enabled: "true"
3431

3532
karpenter_controller_cpu: "25m"
3633
karpenter_controller_memory: "256Mi"
@@ -254,11 +251,7 @@ polarsignals_enabled: "false"
254251

255252
# Emergency Access Service
256253
# Control whether the emergency access service is enabled or not.
257-
{{ if and (eq .Cluster.Environment "production") (eq .Cluster.Provider "zalando-aws") }}
258-
emergency_access_service_enabled: "true"
259-
{{else}}
260254
emergency_access_service_enabled: "false"
261-
{{end}}
262255

263256
# Kube-Metrics-Adapter
264257
## Scheduled scaling metrics: ramp up/down over this period of time

0 commit comments

Comments
 (0)