Merge branch 'dev' into container-registry.zalando.net/teapot/skipper-internal

Author: vlktna

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 }}

cluster/manifests/skipper/hostname-credentials-controller.yaml

@@ -1,5 +1,5 @@
 # {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
-# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-24" }}
+# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-27" }}
 # {{ $version := index (split $image ":") 1 }}
 apiVersion: v1
 kind: ServiceAccount