Update probe timeouts, delays etc. (#4612)
* Fix merge conflict * Add check delay * Add more liveness and readiness options to metrics-server
This commit is contained in:
parent
d6d7458d68
commit
d588532c9b
14 changed files with 32 additions and 34 deletions
|
@ -69,7 +69,7 @@
|
||||||
},
|
},
|
||||||
"readinessProbe": {
|
"readinessProbe": {
|
||||||
"timeoutSeconds": 3,
|
"timeoutSeconds": 3,
|
||||||
"initialDelaySeconds": 60,
|
"initialDelaySeconds": 3,
|
||||||
"exec": {
|
"exec": {
|
||||||
"command": [
|
"command": [
|
||||||
"/bin/bash",
|
"/bin/bash",
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
},
|
},
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"timeoutSeconds": 3,
|
"timeoutSeconds": 3,
|
||||||
"initialDelaySeconds": 60,
|
"initialDelaySeconds": 10,
|
||||||
"exec": {
|
"exec": {
|
||||||
"command": [
|
"command": [
|
||||||
"/bin/bash",
|
"/bin/bash",
|
||||||
|
|
|
@ -106,7 +106,7 @@
|
||||||
},
|
},
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"timeoutSeconds": 3,
|
"timeoutSeconds": 3,
|
||||||
"initialDelaySeconds": 30,
|
"initialDelaySeconds": 10,
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
"path": "/hello",
|
"path": "/hello",
|
||||||
"port": 8080
|
"port": 8080
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
},
|
},
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"timeoutSeconds": 3,
|
"timeoutSeconds": 3,
|
||||||
"initialDelaySeconds": 30,
|
"initialDelaySeconds": 10,
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
"path": "/hello",
|
"path": "/hello",
|
||||||
"port": 8080
|
"port": 8080
|
||||||
|
|
|
@ -91,19 +91,17 @@ spec:
|
||||||
path: /health
|
path: /health
|
||||||
port: 8080
|
port: 8080
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
failureThreshold: 5
|
failureThreshold: 10
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
port: 8080
|
port: 8080
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
failureThreshold: 5
|
failureThreshold: 10
|
||||||
dnsPolicy: Default
|
dnsPolicy: Default
|
||||||
volumes:
|
volumes:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
|
|
|
@ -184,8 +184,6 @@ spec:
|
||||||
scheme: HTTPS
|
scheme: HTTPS
|
||||||
path: /
|
path: /
|
||||||
port: 8443
|
port: 8443
|
||||||
initialDelaySeconds: 30
|
|
||||||
timeoutSeconds: 30
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: kubernetes-dashboard-certs
|
- name: kubernetes-dashboard-certs
|
||||||
secret:
|
secret:
|
||||||
|
|
|
@ -60,10 +60,18 @@ spec:
|
||||||
path: /health
|
path: /health
|
||||||
port: 8080
|
port: 8080
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
failureThreshold: 3
|
failureThreshold: 10
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
host: {{ nodelocaldns_ip }}
|
||||||
|
path: /health
|
||||||
|
port: 8080
|
||||||
|
scheme: HTTP
|
||||||
|
timeoutSeconds: 5
|
||||||
|
successThreshold: 1
|
||||||
|
failureThreshold: 10
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
mountPath: /etc/coredns
|
mountPath: /etc/coredns
|
||||||
|
|
|
@ -76,16 +76,16 @@ spec:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: 10254
|
port: 10254
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 5
|
||||||
periodSeconds: 10
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
timeoutSeconds: 1
|
failureThreshold: 10
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: 10254
|
port: 10254
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
periodSeconds: 10
|
timeoutSeconds: 5
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
timeoutSeconds: 1
|
failureThreshold: 10
|
||||||
|
|
|
@ -44,24 +44,22 @@ spec:
|
||||||
name: https
|
name: https
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
failureThreshold: 3
|
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: https
|
port: https
|
||||||
scheme: HTTPS
|
scheme: HTTPS
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 30
|
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
|
initialDelaySeconds: 20
|
||||||
|
failureThreshold: 3
|
||||||
timeoutSeconds: 10
|
timeoutSeconds: 10
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
failureThreshold: 3
|
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: 443
|
port: 443
|
||||||
scheme: HTTPS
|
scheme: HTTPS
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 30
|
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
|
initialDelaySeconds: 20
|
||||||
|
failureThreshold: 3
|
||||||
timeoutSeconds: 10
|
timeoutSeconds: 10
|
||||||
securityContext:
|
securityContext:
|
||||||
# Currently non root is not supported:
|
# Currently non root is not supported:
|
||||||
|
|
|
@ -218,10 +218,10 @@ spec:
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
path: /liveness
|
path: /liveness
|
||||||
port: 9099
|
port: 9099
|
||||||
periodSeconds: 10
|
initialDelaySeconds: 5
|
||||||
initialDelaySeconds: 10
|
|
||||||
failureThreshold: 6
|
failureThreshold: 6
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
|
failureThreshold: 6
|
||||||
{% if calico_version is version('v3.3.0', '<') %}
|
{% if calico_version is version('v3.3.0', '<') %}
|
||||||
httpGet:
|
httpGet:
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
|
@ -234,7 +234,6 @@ spec:
|
||||||
- -bird-ready
|
- -bird-ready
|
||||||
- -felix-ready
|
- -felix-ready
|
||||||
{% endif %}
|
{% endif %}
|
||||||
periodSeconds: 10
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /lib/modules
|
- mountPath: /lib/modules
|
||||||
name: lib-modules
|
name: lib-modules
|
||||||
|
|
|
@ -253,7 +253,7 @@ spec:
|
||||||
path: /liveness
|
path: /liveness
|
||||||
port: 9099
|
port: 9099
|
||||||
periodSeconds: 10
|
periodSeconds: 10
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 5
|
||||||
failureThreshold: 6
|
failureThreshold: 6
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
{% if calico_version is version('v3.3.0', '<')%}
|
{% if calico_version is version('v3.3.0', '<')%}
|
||||||
|
|
|
@ -132,10 +132,7 @@ spec:
|
||||||
command:
|
command:
|
||||||
- cilium
|
- cilium
|
||||||
- status
|
- status
|
||||||
# The initial delay for the liveness probe is intentionally large to
|
initialDelaySeconds: 15
|
||||||
# avoid an endless kill & restart cycle if in the event that the initial
|
|
||||||
# bootstrapping takes longer than expected.
|
|
||||||
initialDelaySeconds: 120
|
|
||||||
failureThreshold: 10
|
failureThreshold: 10
|
||||||
periodSeconds: 10
|
periodSeconds: 10
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
|
|
|
@ -104,7 +104,7 @@ spec:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: 20244
|
port: 20244
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 5
|
||||||
periodSeconds: 3
|
periodSeconds: 3
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
@ -22,6 +22,7 @@ kube_encrypt_secret_data: true
|
||||||
cert_manager_enabled: true
|
cert_manager_enabled: true
|
||||||
# Disabled temporarily
|
# Disabled temporarily
|
||||||
metrics_server_enabled: false
|
metrics_server_enabled: false
|
||||||
|
metrics_server_kubelet_insecure_tls: true
|
||||||
kube_token_auth: true
|
kube_token_auth: true
|
||||||
kube_basic_auth: true
|
kube_basic_auth: true
|
||||||
enable_nodelocaldns: false
|
enable_nodelocaldns: false
|
||||||
|
|
|
@ -19,8 +19,7 @@ ingress_nginx_enabled: true
|
||||||
cert_manager_enabled: true
|
cert_manager_enabled: true
|
||||||
# Disabled temporarily
|
# Disabled temporarily
|
||||||
metrics_server_enabled: false
|
metrics_server_enabled: false
|
||||||
|
metrics_server_kubelet_insecure_tls: true
|
||||||
kube_token_auth: true
|
kube_token_auth: true
|
||||||
kube_basic_auth: true
|
kube_basic_auth: true
|
||||||
enable_nodelocaldns: false
|
enable_nodelocaldns: false
|
||||||
|
|
||||||
vm_memory: 6144Mi
|
|
||||||
|
|
Loading…
Reference in a new issue