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