Update probe timeouts, delays etc. (#4612)

* Fix merge conflict * Add check delay * Add more liveness and readiness options to metrics-server
6 years ago · d588532c9b
14 changed files with 32 additions and 34 deletions
--- a/contrib/network-storage/heketi/roles/provision/templates/glusterfs-daemonset.json.j2
+++ b/contrib/network-storage/heketi/roles/provision/templates/glusterfs-daemonset.json.j2
@ -69,7 +69,7 @@
                        },
                        "readinessProbe": {
                            "timeoutSeconds": 3,
-                            "initialDelaySeconds": 60,
+                            "initialDelaySeconds": 3,
                            "exec": {
                                "command": [
                                    "/bin/bash",
@ -80,7 +80,7 @@
                        },
                        "livenessProbe": {
                            "timeoutSeconds": 3,
-                            "initialDelaySeconds": 60,
+                            "initialDelaySeconds": 10,
                            "exec": {
                                "command": [
                                    "/bin/bash",
--- a/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2
+++ b/contrib/network-storage/heketi/roles/provision/templates/heketi-bootstrap.json.j2
@ -106,7 +106,7 @@
                },
                "livenessProbe": {
                  "timeoutSeconds": 3,
-                  "initialDelaySeconds": 30,
+                  "initialDelaySeconds": 10,
                  "httpGet": {
                    "path": "/hello",
                    "port": 8080
--- a/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2
+++ b/contrib/network-storage/heketi/roles/provision/templates/heketi-deployment.json.j2
@ -122,7 +122,7 @@
                },
                "livenessProbe": {
                  "timeoutSeconds": 3,
-                  "initialDelaySeconds": 30,
+                  "initialDelaySeconds": 10,
                  "httpGet": {
                    "path": "/hello",
                    "port": 8080
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@ -91,19 +91,17 @@ spec:
            path: /health
            port: 8080
            scheme: HTTP
-          initialDelaySeconds: 60
          timeoutSeconds: 5
          successThreshold: 1
-          failureThreshold: 5
+          failureThreshold: 10
        readinessProbe:
          httpGet:
            path: /health
            port: 8080
            scheme: HTTP
-          initialDelaySeconds: 60
          timeoutSeconds: 5
          successThreshold: 1
-          failureThreshold: 5
+          failureThreshold: 10
      dnsPolicy: Default
      volumes:
        - name: config-volume
--- a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
@ -184,8 +184,6 @@ spec:
            scheme: HTTPS
            path: /
            port: 8443
-          initialDelaySeconds: 30
-          timeoutSeconds: 30
      volumes:
      - name: kubernetes-dashboard-certs
        secret:
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@ -60,10 +60,18 @@ spec:
            path: /health
            port: 8080
            scheme: HTTP
-          initialDelaySeconds: 60
          timeoutSeconds: 5
          successThreshold: 1
-          failureThreshold: 3
+          failureThreshold: 10
+        readinessProbe:
+          httpGet:
+            host: {{ nodelocaldns_ip }}
+            path: /health
+            port: 8080
+            scheme: HTTP
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 10
        volumeMounts:
        - name: config-volume
          mountPath: /etc/coredns
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
@ -76,16 +76,16 @@ spec:
              path: /healthz
              port: 10254
              scheme: HTTP
-            initialDelaySeconds: 10
-            periodSeconds: 10
+            initialDelaySeconds: 5
+            timeoutSeconds: 5
            successThreshold: 1
-            timeoutSeconds: 1
+            failureThreshold: 10
          readinessProbe:
            failureThreshold: 3
            httpGet:
              path: /healthz
              port: 10254
              scheme: HTTP
-            periodSeconds: 10
+            timeoutSeconds: 5
            successThreshold: 1
-            timeoutSeconds: 1
+            failureThreshold: 10
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@ -44,24 +44,22 @@ spec:
          name: https
          protocol: TCP
        livenessProbe:
-          failureThreshold: 3
          httpGet:
            path: /healthz
            port: https
            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 30
          successThreshold: 1
+          initialDelaySeconds: 20
+          failureThreshold: 3
          timeoutSeconds: 10
        readinessProbe:
-          failureThreshold: 3
          httpGet:
            path: /healthz
            port: 443
            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 30
          successThreshold: 1
+          initialDelaySeconds: 20
+          failureThreshold: 3
          timeoutSeconds: 10
        securityContext:
          # Currently non root is not supported:
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/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
--- a/roles/network_plugin/canal/templates/canal-node.yaml.j2
+++ b/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', '<')%}
--- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+++ b/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:
--- a/roles/network_plugin/kube-router/templates/kube-router.yml.j2
+++ b/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:
--- a/tests/files/gce_centos7-flannel-addons.yml
+++ b/tests/files/gce_centos7-flannel-addons.yml
@ -22,6 +22,7 @@ kube_encrypt_secret_data: true
 cert_manager_enabled: true
 # Disabled temporarily
 metrics_server_enabled: false
+metrics_server_kubelet_insecure_tls: true
 kube_token_auth: true
 kube_basic_auth: true
 enable_nodelocaldns: false
--- a/tests/files/packet_centos7-flannel-addons.yml
+++ b/tests/files/packet_centos7-flannel-addons.yml
@ -19,8 +19,7 @@ ingress_nginx_enabled: true
 cert_manager_enabled: true
 # Disabled temporarily
 metrics_server_enabled: false
+metrics_server_kubelet_insecure_tls: true
 kube_token_auth: true
 kube_basic_auth: true
 enable_nodelocaldns: false
-
-vm_memory: 6144Mi