Merge dev to dev-to-alpha

Author: k8s-on-aws-manager-app[bot]

cluster/manifests/ingress-controller/deployment.yaml

@@ -75,9 +75,9 @@ spec:
             requests:
               cpu: 50m
               memory: 4Gi
-{{- if eq .Cluster.Provider "zalando-eks"}}
+      # {{ if eq .Cluster.Provider "zalando-eks" }}
       tolerations:
         - key: dedicated
           value: cluster-seed
           effect: NoSchedule
-{{- end}}
+      # {{ end }}