move ALBC setting into admission configuration to avoid circular dependency

Author: Martin Linkhorst

cluster/config-defaults.yaml

@@ -714,13 +714,6 @@ teapot_admission_controller_enable_write_protection_webhook: "true"
 # configure the behaviour of the resource protection admission webhook, `true` blocks, `false` allows
 teapot_admission_controller_prevent_write_operations: "true"
 
-# inject default values into Services for ALBC on EKS
-{{ if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
-teapot_admission_controller_inject_albc_defaults: "true"
-{{ else }}
-teapot_admission_controller_inject_albc_defaults: "false"
-{{ end }}
-
 # Enable and configure Pod Security Policy rules implemented in admission-controller.
 teapot_admission_controller_pod_security_policy_enabled: "true"
 

cluster/manifests/02-admission-control/config.yaml

@@ -13,7 +13,9 @@ data:
   dns.default.subdomain-max-length: "{{ .Cluster.ConfigItems.subdomain_max_length }}"
 
   generic.prevent-write-operations.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_prevent_write_operations }}"
-  generic.inject-albc-defaults.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_inject_albc_defaults }}"
+{{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
+  generic.inject-albc-defaults.enable: "true"
+{{- end }}
 
   pod.container-resource-control.min-memory-request: "25Mi"
   pod.container-resource-control.default-cpu-request: "{{ .Cluster.ConfigItems.teapot_admission_controller_default_cpu_request }}"