Update probe timeouts, delays etc. (#4612)

* Fix merge conflict

* Add check delay

* Add more liveness and readiness options to metrics-server

roles/network_plugin/calico/templates/calico-node.yml.j2

@@ -218,10 +218,10 @@ spec:
               host: 127.0.0.1
               path: /liveness
               port: 9099
-            periodSeconds: 10
-            initialDelaySeconds: 10
+            initialDelaySeconds: 5
             failureThreshold: 6
           readinessProbe:
+            failureThreshold: 6
 {% if calico_version is version('v3.3.0', '<') %}
             httpGet:
               host: 127.0.0.1
@@ -234,7 +234,6 @@ spec:
               - -bird-ready
               - -felix-ready
 {% endif %}
-            periodSeconds: 10
           volumeMounts:
             - mountPath: /lib/modules
               name: lib-modules

roles/network_plugin/canal/templates/canal-node.yaml.j2

@@ -253,7 +253,7 @@ spec:
               path: /liveness
               port: 9099
             periodSeconds: 10
-            initialDelaySeconds: 10
+            initialDelaySeconds: 5
             failureThreshold: 6
           readinessProbe:
 {% if calico_version is version('v3.3.0', '<')%}

roles/network_plugin/cilium/templates/cilium-ds.yml.j2

@@ -132,10 +132,7 @@ spec:
               command:
                 - cilium
                 - status
-            # The initial delay for the liveness probe is intentionally large to
-            # avoid an endless kill & restart cycle if in the event that the initial
-            # bootstrapping takes longer than expected.
-            initialDelaySeconds: 120
+            initialDelaySeconds: 15
             failureThreshold: 10
             periodSeconds: 10
           readinessProbe:

roles/network_plugin/kube-router/templates/kube-router.yml.j2

@@ -104,7 +104,7 @@ spec:
           httpGet:
             path: /healthz
             port: 20244
-          initialDelaySeconds: 10
+          initialDelaySeconds: 5
           periodSeconds: 3
         resources:
           requests: