Merge pull request #224 from ropable/master

Update liveness/readiness endpoints, refactor Kustomize labels, bump package versions
dbca-wa · Feb 20, 2024 · c7d0c60 · c7d0c60
2 parents 08b94b7 + 178a855
commit c7d0c60
Show file tree

Hide file tree

Showing 19 changed files with 249 additions and 273 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -59,7 +59,7 @@ jobs:
       #----------------------------------------------
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}

diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -23,13 +23,23 @@ spec:
         resources:
           requests:
             memory: "128Mi"
-            cpu: "25m"
+            cpu: "10m"
           limits:
             memory: "4096Mi"
             cpu: "1000m"
+        startupProbe:
+          httpGet:
+            path: /livez
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 3
+          periodSeconds: 3
+          timeoutSeconds: 3
+          successThreshold: 1
+          failureThreshold: 3
         livenessProbe:
           httpGet:
-            path: /liveness
+            path: /livez
             port: 8080
             scheme: HTTP
           periodSeconds: 10
@@ -38,7 +48,7 @@ spec:
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
-            path: /readiness
+            path: /readyz
             port: 8080
             scheme: HTTP
           periodSeconds: 10

diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: resourcetracking-deployment
   labels:
-    app: resourcetracking-prod
+    app: resourcetracking-deployment
 spec:
   selector:
     matchLabels:
-      app: resourcetracking-prod
+      app: resourcetracking-deployment
   template:
     metadata:
       labels:
-        app: resourcetracking-prod
+        app: resourcetracking-deployment
     spec:
       containers:
       - name: resourcetracking
@@ -67,11 +67,6 @@ spec:
             secretKeyRef:
               name: resourcetracking-env-prod
               key: FLEETCARE_CONTAINER
-        - name: KMI_VEHICLE_BASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: resourcetracking-env-prod
-              key: KMI_VEHICLE_BASE_URL
         - name: TRACPLUS_URL
           valueFrom:
             secretKeyRef:

diff --git a/kustomize/overlays/prod/geoserver_patch.yaml b/kustomize/overlays/prod/geoserver_patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: resourcetracking-geoserver
   labels:
-    app: resourcetracking-geoserver-prod
+    app: resourcetracking-geoserver
 spec:
   selector:
     matchLabels:
-      app: resourcetracking-geoserver-prod
+      app: resourcetracking-geoserver
   template:
     metadata:
       labels:
-        app: resourcetracking-geoserver-prod
+        app: resourcetracking-geoserver
     spec:
       initContainers:
       - name: chown-pvc

diff --git a/kustomize/overlays/prod/geoserver_service_patch.yaml b/kustomize/overlays/prod/geoserver_service_patch.yaml
@@ -4,5 +4,5 @@ metadata:
   name: resourcetracking-geoserver-clusterip
 spec:
   selector:
-    app: resourcetracking-geoserver-prod
+    app: resourcetracking-geoserver
     variant: prod
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
@@ -28,4 +28,4 @@ patches:
   - path: geoserver_service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/resource_tracking
-    newTag: 1.4.4
+    newTag: 1.4.5
diff --git a/kustomize/overlays/prod/pdb.yaml b/kustomize/overlays/prod/pdb.yaml
@@ -6,7 +6,7 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: resourcetracking-prod
+      app: resourcetracking-deployment
       variant: prod
 ---
 apiVersion: policy/v1
@@ -17,5 +17,5 @@ spec:
   minAvailable: 0
   selector:
     matchLabels:
-      app: resourcetracking-geoserver-prod
+      app: resourcetracking-geoserver
       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: resourcetracking-prod
+    app: resourcetracking-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: resourcetracking-deployment
   labels:
-    app: resourcetracking-uat
+    app: resourcetracking-deployment
 spec:
   selector:
     matchLabels:
-      app: resourcetracking-uat
+      app: resourcetracking-deployment
   template:
     metadata:
       labels:
-        app: resourcetracking-uat
+        app: resourcetracking-deployment
     spec:
       containers:
       - name: resourcetracking
@@ -57,11 +57,6 @@ spec:
             secretKeyRef:
               name: resourcetracking-env-uat
               key: DFES_PASS
-        - name: KMI_VEHICLE_BASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: resourcetracking-env-uat
-              key: KMI_VEHICLE_BASE_URL
         - name: TRACPLUS_URL
           valueFrom:
             secretKeyRef:

diff --git a/kustomize/overlays/uat/geoserver_patch.yaml b/kustomize/overlays/uat/geoserver_patch.yaml
@@ -3,15 +3,15 @@ kind: Deployment
 metadata:
   name: resourcetracking-geoserver
   labels:
-    app: resourcetracking-geoserver-uat
+    app: resourcetracking-geoserver
 spec:
   selector:
     matchLabels:
-      app: resourcetracking-geoserver-uat
+      app: resourcetracking-geoserver
   template:
     metadata:
       labels:
-        app: resourcetracking-geoserver-uat
+        app: resourcetracking-geoserver
     spec:
       initContainers:
       - name: chown-pvc

diff --git a/kustomize/overlays/uat/geoserver_service_patch.yaml b/kustomize/overlays/uat/geoserver_service_patch.yaml
@@ -4,5 +4,5 @@ metadata:
   name: resourcetracking-geoserver-clusterip
 spec:
   selector:
-    app: resourcetracking-geoserver-uat
+    app: resourcetracking-geoserver
     variant: uat
diff --git a/kustomize/overlays/uat/pdb.yaml b/kustomize/overlays/uat/pdb.yaml
@@ -6,7 +6,7 @@ spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: resourcetracking-uat
+      app: resourcetracking-deployment
       variant: uat
 ---
 apiVersion: policy/v1
@@ -17,5 +17,5 @@ spec:
   minAvailable: 0
   selector:
     matchLabels:
-      app: resourcetracking-geoserver-uat
+      app: resourcetracking-geoserver
       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: resourcetracking-uat
+    app: resourcetracking-deployment
     variant: uat
diff --git a/kustomize/template/cronjob.yaml b/kustomize/template/cronjob.yaml
@@ -2,6 +2,8 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: resourcetracking-cronjob
+  labels:
+    app: resourcetracking-cronjob
 spec:
   schedule: ""
   concurrencyPolicy: Forbid