Merge pull request #151 from ropable/master

Update gunicorn, add Kustomize HPA resources

ibms_project/middleware.py

@@ -1,3 +1,4 @@
+from django.db import connections
 from django.http import HttpResponse, HttpResponseServerError
 import logging
 
@@ -29,7 +30,6 @@ def readiness(self, request):
         being present.
         """
         try:
-            from django.db import connections
             cursor = connections["default"].cursor()
             cursor.execute("SELECT 1;")
             row = cursor.fetchone()

kustomize/base/deployment.yaml

@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: ibms-deployment
 spec:
-  replicas: 2
   strategy:
     type: RollingUpdate
   template:

kustomize/base/deployment_hpa.yaml

@@ -0,0 +1,17 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: ibms-deployment-hpa
+spec:
+  minReplicas: 1
+  maxReplicas: 3
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+  metrics:
+    - resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 250
+      type: Resource

kustomize/base/kustomization.yaml

@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - deployment.yaml
+  - deployment_hpa.yaml
   - service.yaml

kustomize/overlays/prod/deployment_hpa_patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: ibms-deployment-hpa
+spec:
+  scaleTargetRef:
+    name: ibms-deployment-prod

kustomize/overlays/prod/kustomization.yaml

@@ -14,9 +14,10 @@ labels:
   - includeSelectors: true
     pairs:
       variant: prod
-images:
-  - name: ghcr.io/dbca-wa/ibms
-    newTag: 2.8.4
 patches:
   - path: deployment_patch.yaml
+  - path: deployment_hpa_patch.yaml
   - path: service_patch.yaml
+images:
+  - name: ghcr.io/dbca-wa/ibms
+    newTag: 2.8.5

kustomize/overlays/uat/deployment_hpa_patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: ibms-deployment-hpa
+spec:
+  scaleTargetRef:
+    name: ibms-deployment-uat

kustomize/overlays/uat/kustomization.yaml

@@ -16,4 +16,5 @@ labels:
       variant: uat
 patches:
   - path: deployment_patch.yaml
+  - path: deployment_hpa_patch.yaml
   - path: service_patch.yaml

pyproject.toml

@@ -1,19 +1,19 @@
 [tool.poetry]
 name = "ibms"
-version = "2.8.4"
+version = "2.8.5"
 description = "Integrated Business Management System corporate application"
 authors = ["Ashley Felton <[email protected]>"]
 license = "Apache-2.0"
 
 [tool.poetry.dependencies]
 python = ">=3.11"
-django = "4.2.10"
+django = "4.2.11"
 psycopg2 = "2.9.9"
-dbca-utils = "2.0.1"
+dbca-utils = "2.0.2"
 django-extensions = "3.2.3"
 python-dotenv = "1.0.1"
 dj-database-url = "2.1.0"
-gunicorn = "21.2.0"
+gunicorn = "22.0.0"
 django-crispy-forms = "2.1"
 crispy-bootstrap5 = "2024.2"
 xlrd = "2.0.1"  # TODO: deprecate
@@ -23,12 +23,12 @@ openpyxl = "3.1.2"
 webtemplate-dbca = "1.7.0"
 whitenoise = {version = "6.6.0", extras = ["brotli"]}
 mixer = "7.2.2"
-sentry-sdk = {version = "1.40.5", extras = ["django"]}
+sentry-sdk = {version = "1.45.0", extras = ["django"]}
 
 [tool.poetry.group.dev.dependencies]
-ipython = "^8.22.1"
+ipython = "^8.23.0"
 ipdb = "^0.13.13"
-pre-commit = "^3.6.2"
+pre-commit = "^3.7.0"
 
 [build-system]
 requires = ["poetry-core"]