Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Use a startup probe instead of an initialDelay to handle manager pod startup times (#2008)

Eric Bariauxe40ad997eb5f
diff --git a/kubernetes/README-AWS.md b/kubernetes/README-AWS.md
index 3e948d1fd..833e5840d 100644
--- a/kubernetes/README-AWS.md
+++ b/kubernetes/README-AWS.md
@@ -160,11 +160,9 @@ helm install manager manager -f manager/values-haproxy-eks.yaml -f manager/value
--set-string or.hostname=$FQDN
```
-This values file does three things:
+This values file does two things:
- get the demo image from the private ECR
- enable the demo setup
-- add an initial delay for the probes, given the setup code time to run (otherwise k8s kills the pod before setup code finishes)
-
## Current limitations / explorations to do
diff --git a/kubernetes/manager/templates/deployment.yaml b/kubernetes/manager/templates/deployment.yaml
index ea03b7da8..6ca139d7b 100644
--- a/kubernetes/manager/templates/deployment.yaml
+++ b/kubernetes/manager/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
{{- toYaml .Values.livenessProbe | nindent 12 }}
readinessProbe:
{{- toYaml .Values.readinessProbe | nindent 12 }}
+ startupProbe:
+ {{- toYaml .Values.startupProbe | nindent 12 }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
env:
diff --git a/kubernetes/manager/values-demo.yaml b/kubernetes/manager/values-demo.yaml
index 8d84481d6..b0e68cfbb 100644
--- a/kubernetes/manager/values-demo.yaml
+++ b/kubernetes/manager/values-demo.yaml
@@ -6,13 +6,17 @@ livenessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 120
periodSeconds: 5
readinessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 120
+ periodSeconds: 5
+startupProbe:
+ httpGet:
+ path: /
+ port: 8080
+ failureThreshold: 30
periodSeconds: 5
or:
diff --git a/kubernetes/manager/values-eks.yaml b/kubernetes/manager/values-eks.yaml
index 1de0d411d..03707d163 100644
--- a/kubernetes/manager/values-eks.yaml
+++ b/kubernetes/manager/values-eks.yaml
@@ -2,14 +2,18 @@ livenessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 5
- periodSeconds: 20
+ periodSeconds: 5
readinessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 5
- periodSeconds: 20
+ periodSeconds: 5
+startupProbe:
+ httpGet:
+ path: /
+ port: 8080
+ failureThreshold: 30
+ periodSeconds: 5
ingress:
enabled: true
hosts:
diff --git a/kubernetes/manager/values.yaml b/kubernetes/manager/values.yaml
index 92371530c..b38aeb1c2 100644
--- a/kubernetes/manager/values.yaml
+++ b/kubernetes/manager/values.yaml
@@ -97,13 +97,17 @@ livenessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 5
periodSeconds: 5
readinessProbe:
httpGet:
path: /
port: 8080
- initialDelaySeconds: 5
+ periodSeconds: 5
+startupProbe:
+ httpGet:
+ path: /
+ port: 8080
+ failureThreshold: 30
periodSeconds: 5
# Size of volume requested in PVC, must be aligned with available PV