Merge pull request #9252 from zalando-incubator/flannel-awaiter-older-nodes

Author: mikkeloscar

cluster/config-defaults.yaml

@@ -442,6 +442,10 @@ flannel_awaiter_cpu: "25m"
 flannel_awaiter_memory_request: "50Mi"
 flannel_awaiter_memory_limit: "50Mi"
 
+# configure flannel-awaiter to only check for nodes older than the current node
+# and set timeout for nodes being reachable to 30s (down from the default of 2m).
+flannel_awaiter_check_only_older_nodes: "true"
+
 # nvidia device plugin
 nvidia_device_plugin_cpu: "10m"
 nvidia_device_plugin_memory: "50Mi"

cluster/manifests/flannel/daemonset.yaml

@@ -39,9 +39,19 @@ spec:
             memory: 50Mi
       containers:
       - name: delayed-install-cni
-        image: container-registry.zalando.net/teapot/flannel-awaiter:master-15
+        image: container-registry.zalando.net/teapot/flannel-awaiter:master-16
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         command:
         - /await
+        {{- if eq .Cluster.ConfigItems.flannel_awaiter_check_only_older_nodes "true" }}
+        args:
+        - "--own-node-name=$(NODE_NAME)"
+        - "--timeout=30s"
+        {{- end }}
         stdin: true
         resources:
           requests: