Allow PRS location layer name to be defined, update Kustomize resources

kustomize/base/deployment.yaml

@@ -32,10 +32,10 @@ spec:
           value: "Australia/Perth"
         resources:
           requests:
-            memory: "128Mi"
-            cpu: "10m"
+            memory: "100Mi"
+            cpu: "5m"
           limits:
-            memory: "4096Mi"
+            memory: "2Gi"
             cpu: "1000m"
         startupProbe:
           httpGet:

kustomize/base/deployment_hpa.yaml

@@ -3,8 +3,8 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: prs-deployment-hpa
 spec:
-  minReplicas: 1
-  maxReplicas: 3
+  minReplicas: 2
+  maxReplicas: 10
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment

kustomize/overlays/prod/cronjobs/harvest-email-referrals/kustomization.yaml

@@ -5,3 +5,13 @@ resources:
 nameSuffix: -harvest-email-referrals
 patches:
   - path: patch.yaml
+  # Patch the CronJob container name
+  - target:
+      kind: CronJob
+      name: prs-cronjob
+    options:
+      allowNameChange: true
+    patch: |-
+      - op: replace
+        path: /spec/jobTemplate/spec/template/spec/containers/0/name
+        value: prs-cronjob-harvest-email-referrals

kustomize/overlays/prod/cronjobs/overdue-task-email/kustomization.yaml

@@ -5,3 +5,13 @@ resources:
 nameSuffix: -overdue-task-email
 patches:
   - path: patch.yaml
+  # Patch the CronJob container name
+  - target:
+      kind: CronJob
+      name: prs-cronjob
+    options:
+      allowNameChange: true
+    patch: |-
+      - op: replace
+        path: /spec/jobTemplate/spec/template/spec/containers/0/name
+        value: prs-cronjob-overdue-task-email

kustomize/overlays/prod/kustomization.yaml

@@ -30,4 +30,4 @@ patches:
   - path: geoserver_service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/prs
-    newTag: 2.5.52
+    newTag: 2.5.53

kustomize/overlays/uat/cronjobs/harvest-email-referrals/kustomization.yaml

@@ -5,3 +5,13 @@ resources:
 nameSuffix: -harvest-email-referrals
 patches:
   - path: patch.yaml
+  # Patch the CronJob container name
+  - target:
+      kind: CronJob
+      name: prs-cronjob
+    options:
+      allowNameChange: true
+    patch: |-
+      - op: replace
+        path: /spec/jobTemplate/spec/template/spec/containers/0/name
+        value: prs-cronjob-harvest-email-referrals

kustomize/overlays/uat/cronjobs/overdue-task-email/kustomization.yaml

@@ -5,3 +5,13 @@ resources:
 nameSuffix: -overdue-task-email
 patches:
   - path: patch.yaml
+  # Patch the CronJob container name
+  - target:
+      kind: CronJob
+      name: prs-cronjob
+    options:
+      allowNameChange: true
+    patch: |-
+      - op: replace
+        path: /spec/jobTemplate/spec/template/spec/containers/0/name
+        value: prs-cronjob-overdue-task-email

prs2/context_processors.py

@@ -9,6 +9,7 @@ def template_context(request):
         'site_acronym': settings.APPLICATION_ACRONYM,
         'version_no': settings.APPLICATION_VERSION_NO,
         'prs_geoserver_url': settings.PRS_GEOSERVER_URL,
+        'prs_layer_name': settings.PRS_LAYER_NAME,
         'mapproxy_url': settings.MAPPROXY_URL,
         'geocoder_url': settings.GEOCODER_URL,
         'geoserver_url': settings.GEOSERVER_URL,

prs2/referral/static/js/referral_map.js

@@ -1,6 +1,5 @@
 "use strict";
-// NOTE: some global variables are set in the base template.
-
+// NOTE: some global constants are set in the base template.
 // Define baselayer tile layers.
 const landgateOrthomosaic = L.tileLayer.wms(mapproxy_url, {
   layers: 'virtual-mosaic',
@@ -31,7 +30,7 @@ const cadastre = L.tileLayer.wms(mapproxy_url, {
   minZoom: 13,
 });
 const prsLocations = L.tileLayer.wms(prs_geoserver_url, {
-  layers: 'prs:prs_locations_view',
+  layers: prs_layer_name,
   format: 'image/png',
   transparent: true,
   opacity: 0.75,

prs2/settings.py

@@ -48,6 +48,7 @@
 
 # PRS may deploy its own instance of Geoserver.
 PRS_GEOSERVER_URL = env('PRS_GEOSERVER_URL', '')
+PRS_LAYER_NAME = env('PRS_LAYER_NAME', '')
 MAPPROXY_URL = env('MAPPROXY_URL', '')
 GEOCODER_URL = env('GEOCODER_URL', '')
 GEOSERVER_URL = env('GEOSERVER_URL', '')

prs2/templates/base_prs.html

@@ -170,6 +170,7 @@
 <script>
     // Set global variables, used by multiple views..
     const prs_geoserver_url = '{{ prs_geoserver_url }}';
+    const prs_layer_name = '{{ prs_layer_name }}';
     const mapproxy_url = '{{ mapproxy_url }}';
     const geoserver_url = '{{ geoserver_url }}';
     const geocoder_url = '{% url "geocode_query" %}';

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prs"
-version = "2.5.52"
+version = "2.5.53"
 description = "Planning Referral System corporate application"
 authors = ["Ashley Felton <[email protected]>"]
 license = "Apache-2.0"
@@ -35,11 +35,11 @@ django-celery-results = "2.5.1"
 pygeopkg = "0.1.3"
 whitenoise = {version = "6.7.0", extras = ["brotli"]}
 django-crum = "0.7.9"
-django-storages = {version = "1.14.3", extras = ["azure"]}
-sentry-sdk = {version = "2.8.0", extras = ["django"]}
+sentry-sdk = {version = "2.10.0", extras = ["django"]}
 crispy-bootstrap5 = "2024.2"
 redis = "5.0.7"
 xlsxwriter = "3.2.0"
+django-storages = {version = "1.14.4", extras = ["azure"]}
 
 [tool.poetry.group.dev.dependencies]
 ipython = "^8.26.0"