Merge pull request #77 from ropable/master

Update liveness/readiness endpoints and Kustomize labels
dbca-wa · Mar 5, 2024 · b42e7ec · b42e7ec
2 parents 12ccf3b + c80132d
commit b42e7ec
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 16 deletions.
diff --git a/geocoder.py b/geocoder.py
@@ -25,13 +25,13 @@ def index():
     return static_file('index.html', root='caddy/templates')
 
 
-@app.route('/liveness')
+@app.route('/livez')
 def liveness():
     response.content_type = 'application/json'
     return '{"liveness": "OK"}'
 
 
-@app.route('/readiness')
+@app.route('/readyz')
 def readiness():
     sql = text('SELECT 1')
     s = Session()

diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -24,24 +24,36 @@ spec:
           limits:
             memory: "2Gi"
             cpu: "1000m"
+        startupProbe:
+          httpGet:
+            path: /livez
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 3
+          periodSeconds: 15
+          timeoutSeconds: 10
+          successThreshold: 1
+          failureThreshold: 3
         livenessProbe:
           httpGet:
-            path: /liveness
+            path: /livez
             port: 8080
             scheme: HTTP
+          initialDelaySeconds: 0
           periodSeconds: 15
           successThreshold: 1
           failureThreshold: 3
-          timeoutSeconds: 5
+          timeoutSeconds: 10
         readinessProbe:
           httpGet:
-            path: /readiness
+            path: /readyz
             port: 8080
             scheme: HTTP
+          initialDelaySeconds: 0
           periodSeconds: 15
           successThreshold: 1
           failureThreshold: 3
-          timeoutSeconds: 5
+          timeoutSeconds: 10
         securityContext:
           runAsNonRoot: true
           privileged: false

diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: caddy-deployment
   labels:
-    app: caddy-prod
+    app: caddy-deployment
 spec:
   selector:
     matchLabels:
-      app: caddy-prod
+      app: caddy-deployment
   template:
     metadata:
       labels:
-        app: caddy-prod
+        app: caddy-deployment
     spec:
       containers:
       - name: caddy

diff --git a/kustomize/overlays/prod/pdb.yaml b/kustomize/overlays/prod/pdb.yaml
@@ -6,5 +6,5 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: caddy-prod
+      app: caddy-deployment
       variant: prod
diff --git a/kustomize/overlays/prod/service_patch.yaml b/kustomize/overlays/prod/service_patch.yaml
@@ -5,5 +5,5 @@ metadata:
 spec:
   type: ClusterIP
   selector:
-    app: caddy-prod
+    app: caddy-deployment
     variant: prod
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: caddy-deployment
   labels:
-    app: caddy-uat
+    app: caddy-deployment
 spec:
   selector:
     matchLabels:
-      app: caddy-uat
+      app: caddy-deployment
   template:
     metadata:
       labels:
-        app: caddy-uat
+        app: caddy-deployment
     spec:
       containers:
       - name: caddy

diff --git a/kustomize/overlays/uat/pdb.yaml b/kustomize/overlays/uat/pdb.yaml
@@ -6,5 +6,5 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: caddy-uat
+      app: caddy-deployment
       variant: uat
diff --git a/kustomize/overlays/uat/service_patch.yaml b/kustomize/overlays/uat/service_patch.yaml
@@ -5,5 +5,5 @@ metadata:
 spec:
   type: ClusterIP
   selector:
-    app: caddy-uat
+    app: caddy-deployment
     variant: uat