Merge pull request #73 from mumoshu/fix-flanneld-startup-slowness

fix: flanneld startup slowness

Author: mumoshu

config/templates/cloud-config-controller

@@ -34,6 +34,8 @@ coreos:
             --key-file=/etc/kubernetes/ssl/etcd-client-key.pem \
             --endpoints="{{.EtcdEndpoints}}" \
             set /coreos.com/network/config '{"Network" : "{{.PodCIDR}}", "Backend" : {"Type" : "vxlan"}}'
+            TimeoutStartSec=120
+
     - name: kubelet.service
       command: start
       runtime: true

config/templates/cloud-config-worker

@@ -26,6 +26,7 @@ coreos:
             [Service]
             ExecStartPre=/opt/bin/decrypt-tls-assets
             Environment="ETCD_SSL_DIR=/etc/kubernetes/ssl"
+            TimeoutStartSec=120
 
     - name: kubelet.service
       command: start