From c962eeb975af5ecf9793f794d536538d210b7735 Mon Sep 17 00:00:00 2001
From: Bryan Strassner <bryan.strassner@gmail.com>
Date: Wed, 4 Apr 2018 14:12:35 -0500
Subject: [PATCH] [fix] Extend liveness and readiness check times

Under load, Deckhand will fail liveness checks with a 1 second timeout.
This Patchset extends the timout to 10 seconds and spaces the period
between checks to 20 seconds.
Adds labels to keystone user job.

Change-Id: Id2d4deaaf8bf73d6df4639810e6dee3acf79b05c
---
 charts/deckhand/templates/deployment.yaml     | 6 ++++--
 charts/deckhand/templates/job-ks-service.yaml | 2 +-
 charts/deckhand/templates/job-ks-user.yaml    | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/charts/deckhand/templates/deployment.yaml b/charts/deckhand/templates/deployment.yaml
index 592f3c08..76b51f9b 100644
--- a/charts/deckhand/templates/deployment.yaml
+++ b/charts/deckhand/templates/deployment.yaml
@@ -67,14 +67,16 @@ spec:
               path: /api/v1.0/health
               port: {{ tuple "deckhand" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 15
-            periodSeconds: 10
+            periodSeconds: 20
+            timeoutSeconds: 10
           readinessProbe:
             httpGet:
               scheme: HTTP
               path: /api/v1.0/health
               port: {{ tuple "deckhand" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 15
-            periodSeconds: 10
+            periodSeconds: 20
+            timeoutSeconds: 10
           volumeMounts:
             - name: etc-deckhand
               mountPath: /etc/deckhand
diff --git a/charts/deckhand/templates/job-ks-service.yaml b/charts/deckhand/templates/job-ks-service.yaml
index 94f98d64..631b357e 100644
--- a/charts/deckhand/templates/job-ks-service.yaml
+++ b/charts/deckhand/templates/job-ks-service.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       labels:
-{{ tuple $envAll "deckhand" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "deckhand" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure
diff --git a/charts/deckhand/templates/job-ks-user.yaml b/charts/deckhand/templates/job-ks-user.yaml
index 7e822b8e..0780396d 100644
--- a/charts/deckhand/templates/job-ks-user.yaml
+++ b/charts/deckhand/templates/job-ks-user.yaml
@@ -25,6 +25,9 @@ metadata:
   name: deckhand-ks-user
 spec:
   template:
+    metadata:
+      labels:
+{{ tuple $envAll "deckhand" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       restartPolicy: OnFailure