Merge branch 'dev' into eks

zalando-incubator · Nov 25, 2024 · 1300652 · 1300652
2 parents de0a691 + 0b3171b
commit 1300652
Show file tree

Hide file tree

Showing 3 changed files with 1,049 additions and 0 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -1194,7 +1194,12 @@ teapot_admission_controller_scheduling_controls_enabled: "false"
 teapot_admission_controller_scheduling_controls_default_architecture: "amd64"
 
 # role-sync-controller configs
+# Enabled by default only on Zalando EKS clusters
+{{ if eq .Cluster.Provider "zalando-eks" }}
+role_sync_controller_enabled: "true"
+{{ else }}
 role_sync_controller_enabled: "false"
+{{ end }}
 
 # EKS specific configuration
 eks_control_plane_logging: "false"