Merge remote-tracking branch 'origin/dev' into eks

Author: Martin Linkhorst

cluster/manifests/01-coredns-local/daemonset-coredns.yaml

@@ -25,6 +25,7 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9153"
     spec:
+      terminationGracePeriodSeconds: 40
       initContainers:
       - name: ensure-apiserver
 {{- if eq .Cluster.Provider "zalando-eks" }}
@@ -78,7 +79,7 @@ spec:
         lifecycle:
           preStop:
             sleep:
-              seconds: 25
+              seconds: 35
         resources:
           requests:
             ephemeral-storage: 256Mi
@@ -158,6 +159,10 @@ spec:
           limits:
             cpu: {{.Cluster.ConfigItems.dns_dnsmasq_cpu}}
             memory: {{.Cluster.ConfigItems.dns_dnsmasq_mem}}
+        lifecycle:
+          preStop:
+            sleep:
+              seconds: 35
       - name: sidecar
         {{- if eq .Cluster.Provider "zalando-eks" }}
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-dns-sidecar:1.17.4-master-15
@@ -191,6 +196,10 @@ spec:
           limits:
             cpu: {{.Cluster.ConfigItems.dns_dnsmasq_sidecar_cpu}}
             memory: {{.Cluster.ConfigItems.dns_dnsmasq_sidecar_mem}}
+        lifecycle:
+          preStop:
+            sleep:
+              seconds: 35
 {{ end }}
       - name: coredns
         {{- if eq .Cluster.Provider "zalando-eks" }}
@@ -238,6 +247,10 @@ spec:
           limits:
             cpu: {{.Cluster.ConfigItems.dns_coredns_cpu}}
             memory: {{.Cluster.ConfigItems.dns_coredns_mem}}
+        lifecycle:
+          preStop:
+            sleep:
+              seconds: 35
       priorityClassName: system-node-critical
       serviceAccountName: coredns
       hostNetwork: true