feat(app): add startupProbe

SocialGouv · May 26, 2020 · ec6e468 · ec6e468
1 parent 375cb0d
commit ec6e468
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 33 deletions.
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
@@ -48,32 +48,39 @@ spec:
         - image: >-
             registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app:123456789
           livenessProbe:
-            failureThreshold: 11
+            failureThreshold: 6
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 30
             periodSeconds: 5
             timeoutSeconds: 5
           name: www
           ports:
             - containerPort: 8080
               name: http
           readinessProbe:
-            failureThreshold: 5
+            failureThreshold: 15
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 1
           resources:
             limits:
               cpu: 500m
               memory: 128Mi
             requests:
               cpu: 5m
               memory: 16Mi
+          startupProbe:
+            failureThreshold: 12
+            httpGet:
+              path: /healthz
+              port: http
+            periodSeconds: 5
 apiVersion: apps/v1
 kind: Deployment
 ---

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -48,32 +48,39 @@ spec:
         - image: >-
             registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app:1.2.3
           livenessProbe:
-            failureThreshold: 11
+            failureThreshold: 6
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 30
             periodSeconds: 5
             timeoutSeconds: 5
           name: www
           ports:
             - containerPort: 8080
               name: http
           readinessProbe:
-            failureThreshold: 5
+            failureThreshold: 15
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 1
           resources:
             limits:
               cpu: 500m
               memory: 128Mi
             requests:
               cpu: 5m
               memory: 16Mi
+          startupProbe:
+            failureThreshold: 12
+            httpGet:
+              path: /healthz
+              port: http
+            periodSeconds: 5
 apiVersion: apps/v1
 kind: Deployment
 ---

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -29,32 +29,39 @@ spec:
         - image: >-
             registry.gitlab.factory.social.gouv.fr/socialgouv/sample-next-app:1.2.3
           livenessProbe:
-            failureThreshold: 11
+            failureThreshold: 6
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 30
             periodSeconds: 5
             timeoutSeconds: 5
           name: www
           ports:
             - containerPort: 8080
               name: http
           readinessProbe:
-            failureThreshold: 5
+            failureThreshold: 15
             httpGet:
               path: /healthz
               port: http
-            initialDelaySeconds: 5
+            initialDelaySeconds: 0
             periodSeconds: 5
-            timeoutSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 1
           resources:
             limits:
               cpu: 500m
               memory: 128Mi
             requests:
               cpu: 5m
               memory: 16Mi
+          startupProbe:
+            failureThreshold: 12
+            httpGet:
+              path: /healthz
+              port: http
+            periodSeconds: 5
 apiVersion: apps/v1
 kind: Deployment
 ---

diff --git a/src/components/app/__snapshots__/index.test.ts.snap b/src/components/app/__snapshots__/index.test.ts.snap
@@ -30,12 +30,12 @@ Object {
             Object {
               "image": "image_name:image_tag",
               "livenessProbe": Object {
-                "failureThreshold": 11,
+                "failureThreshold": 6,
                 "httpGet": Object {
                   "path": "/healthz",
                   "port": "http",
                 },
-                "initialDelaySeconds": 5,
+                "initialDelaySeconds": 30,
                 "periodSeconds": 5,
                 "timeoutSeconds": 5,
               },
@@ -47,14 +47,15 @@ Object {
                 },
               ],
               "readinessProbe": Object {
-                "failureThreshold": 5,
+                "failureThreshold": 15,
                 "httpGet": Object {
                   "path": "/healthz",
                   "port": "http",
                 },
-                "initialDelaySeconds": 5,
+                "initialDelaySeconds": 0,
                 "periodSeconds": 5,
-                "timeoutSeconds": 5,
+                "successThreshold": 1,
+                "timeoutSeconds": 1,
               },
               "resources": Object {
                 "limits": Object {
@@ -66,6 +67,14 @@ Object {
                   "memory": "16Mi",
                 },
               },
+              "startupProbe": Object {
+                "failureThreshold": 12,
+                "httpGet": Object {
+                  "path": "/healthz",
+                  "port": "http",
+                },
+                "periodSeconds": 5,
+              },
             },
           ],
         },
@@ -176,12 +185,12 @@ Object {
             Object {
               "image": "image_name:image_tag",
               "livenessProbe": Object {
-                "failureThreshold": 11,
+                "failureThreshold": 6,
                 "httpGet": Object {
                   "path": "/healthz",
                   "port": "http",
                 },
-                "initialDelaySeconds": 5,
+                "initialDelaySeconds": 30,
                 "periodSeconds": 5,
                 "timeoutSeconds": 5,
               },
@@ -193,14 +202,15 @@ Object {
                 },
               ],
               "readinessProbe": Object {
-                "failureThreshold": 5,
+                "failureThreshold": 15,
                 "httpGet": Object {
                   "path": "/healthz",
                   "port": "http",
                 },
-                "initialDelaySeconds": 5,
+                "initialDelaySeconds": 0,
                 "periodSeconds": 5,
-                "timeoutSeconds": 5,
+                "successThreshold": 1,
+                "timeoutSeconds": 1,
               },
               "resources": Object {
                 "limits": Object {
@@ -212,6 +222,14 @@ Object {
                   "memory": "16Mi",
                 },
               },
+              "startupProbe": Object {
+                "failureThreshold": 12,
+                "httpGet": Object {
+                  "path": "/healthz",
+                  "port": "http",
+                },
+                "periodSeconds": 5,
+              },
             },
           ],
         },

diff --git a/src/components/app/deployment.ts b/src/components/app/deployment.ts
@@ -22,14 +22,14 @@ export default (params: Params): Deployment => {
             {
               image: `${params.image.name}:${params.image.tag}`,
               livenessProbe: {
-                // 11 x 5s + 30s = 30-1m
+                // 6 x 5s + 30s = 30-1m
                 // Kill the pod if not alive after 1 minute
-                failureThreshold: 11,
+                failureThreshold: 6,
                 httpGet: {
                   path: "/healthz",
                   port: "http",
                 },
-                initialDelaySeconds: 5,
+                initialDelaySeconds: 30,
                 periodSeconds: 5,
                 timeoutSeconds: 5,
               },
@@ -41,16 +41,17 @@ export default (params: Params): Deployment => {
                 },
               ],
               readinessProbe: {
-                // 5 x 5s + 5s = 5-30s
-                // Mark pod as unhealthy after 30s
-                failureThreshold: 5,
+                // 15 x 1s = 0-15s
+                // Mark pod as unhealthy after 15s
+                failureThreshold: 15,
                 httpGet: {
                   path: "/healthz",
                   port: "http",
                 },
-                initialDelaySeconds: 5,
+                initialDelaySeconds: 0,
                 periodSeconds: 5,
-                timeoutSeconds: 5,
+                successThreshold: 1,
+                timeoutSeconds: 1,
               },
               resources: {
                 limits: {
@@ -64,6 +65,16 @@ export default (params: Params): Deployment => {
                   ...(params.requests ?? {}),
                 },
               },
+              startupProbe: {
+                // 12 x 5s = 0-1min
+                // Takes up to 1 minute to start up before it fails
+                failureThreshold: 12,
+                httpGet: {
+                  path: "/healthz",
+                  port: "http",
+                },
+                periodSeconds: 5,
+              },
             },
           ],
         },