From c459e090986a10ffcf478342b38ac0b664c5db31 Mon Sep 17 00:00:00 2001
From: Andrew Stuart <andrew.stuart2@gmail.com>
Date: Thu, 21 Apr 2016 15:44:34 -0700
Subject: [PATCH] contrib/k8s: YAML brevity via references, add min. resource
 requests

- Add resources for deployments
- Add readiness probe for master
- Use YAML references for easier maintenance/readability
---
 contrib/k8s/dex-overlord.yaml | 11 +++++++++--
 contrib/k8s/dex-worker.yaml   | 12 ++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/contrib/k8s/dex-overlord.yaml b/contrib/k8s/dex-overlord.yaml
index e2368c75..33455141 100644
--- a/contrib/k8s/dex-overlord.yaml
+++ b/contrib/k8s/dex-overlord.yaml
@@ -62,11 +62,18 @@ spec:
             - containerPort: 5557
               name: overlord-port
             livenessProbe:
-              httpGet:
+              httpGet: &health
                 path: /health
                 port: 5557
-              initialDelaySeconds: 16
+              initialDelaySeconds: 15
               timeoutSeconds: 1
+            readinessProbe:
+              httpGet: *health
+              initialDelaySeconds: 5
+              timeoutSeconds: 5
+              periodSeconds: 5
+            resources:
+              requests: { cpu: 500m, memory: 512Mi }
             volumeMounts:
               - name: connectors
                 mountPath: /etc/dex-connectors
diff --git a/contrib/k8s/dex-worker.yaml b/contrib/k8s/dex-worker.yaml
index 28f8d259..9a980be2 100644
--- a/contrib/k8s/dex-worker.yaml
+++ b/contrib/k8s/dex-worker.yaml
@@ -40,19 +40,19 @@ spec:
             - containerPort: 5556
               name: worker-port
             readinessProbe:
-              httpGet:
+              httpGet: &health
                 path: /health
                 port: 5556
               timeoutSeconds: 1
               periodSeconds: 2
             livenessProbe:
-              httpGet:
-                path: /health
-                port: 5556
+              httpGet: *health
               initialDelaySeconds: 15
               timeoutSeconds: 1
-              # In production, you will likely want to include your own trusted
-              # /etc/ca-certificates and /etc/ssl in your container.
+            resources:
+              requests: { cpu: 200m, memory: 256Mi }
+            # In production, you will likely want to include your own trusted
+            # /etc/ca-certificates and /etc/ssl in your container.
             volumeMounts:
               - name: ca
                 mountPath: /etc/ca-certificates