Merge pull request #282 from ropable/master

Factor out KMI for KB & Mapproxy, update Kustomize defs, proxy cadastre query from clients
dbca-wa · Jan 18, 2024 · 352eb13 · 352eb13
2 parents 010f703 + a6f1982
commit 352eb13
Show file tree

Hide file tree

Showing 32 changed files with 607 additions and 616 deletions.
diff --git a/.github/workflows/image-build-scan.yml b/.github/workflows/image-build-scan.yml
@@ -27,6 +27,8 @@ jobs:
       #----------------------------------------------
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       #----------------------------------------------
       # Set up Docker BuildX environment
       #----------------------------------------------

diff --git a/README.md b/README.md
@@ -42,11 +42,9 @@ Variables below may also need to be defined in production (context-dependent):
     PLANNING_EMAILS="[email protected],[email protected]"
     ASSESSOR_EMAILS="[email protected],[email protected]"
     SITE_URL="prs.dbca.wa.gov.au"
-    GEOSERVER_WMS_URL="//kmi.dpaw.wa.gov.au/geoserver/gwc/service/wms"
-    GEOSERVER_WFS_URL="//kmi.dpaw.wa.gov.au/geoserver/ows"
+    GEOSERVER_URL="https://geoserver.url/service"
     PRS_USER_GROUP="PRS user"
     PRS_PWUSER_GROUP="PRS power user"
-    BORGCOLLECTOR_API="https://borg.dpaw.wa.gov.au/api/"
     SLIP_USERNAME="slip_username"
     SLIP_PASSWORD="slip_password"
     SLIP_ESRI_FS_URL="https://wfs.slip.url.au/endpoint"

diff --git a/kustomize/base/geoserver.yaml b/kustomize/base/geoserver.yaml
@@ -64,3 +64,4 @@ spec:
           # Note that Geoserver can't cope with a RO root filesystem.
           readOnlyRootFilesystem: false
       restartPolicy: Always
+      terminationGracePeriodSeconds: 180
diff --git a/kustomize/overlays/prod/cronjobs/harvest-email-referrals/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-email-referrals/patch.yaml
@@ -11,7 +11,7 @@ spec:
         spec:
           containers:
           - name: prs-cronjob
-            args: ["manage.py", "harvest_email_referrals", "--email", "--purge-email"]
+            args: ["manage.py", "harvest_email_referrals", "--email-report", "--purge-email"]
             env:
             - name: SITE_URL
               value: "prs.dbca.wa.gov.au"
@@ -20,26 +20,26 @@ spec:
                 secretKeyRef:
                   name: prs-env-prod
                   key: DATABASE_URL
-            - name: PRS_GEOSERVER_WMTS_URL
+            - name: PRS_GEOSERVER_URL
               valueFrom:
                 secretKeyRef:
                   name: prs-env-prod
-                  key: PRS_GEOSERVER_WMTS_URL
-            - name: PRS_GEOSERVER_WFS_URL
+                  key: PRS_GEOSERVER_URL
+            - name: MAPPROXY_URL
               valueFrom:
                 secretKeyRef:
                   name: prs-env-prod
-                  key: PRS_GEOSERVER_WFS_URL
-            - name: GEOSERVER_WMTS_URL
+                  key: MAPPROXY_URL
+            - name: GEOSERVER_URL
               valueFrom:
                 secretKeyRef:
                   name: prs-env-prod
-                  key: GEOSERVER_WMTS_URL
-            - name: GEOSERVER_WFS_URL
+                  key: GEOSERVER_URL
+            - name: CADASTRE_LAYER_NAME
               valueFrom:
                 secretKeyRef:
                   name: prs-env-prod
-                  key: GEOSERVER_WFS_URL
+                  key: CADASTRE_LAYER_NAME
             - name: GEOSERVER_SSO_USER
               valueFrom:
                 secretKeyRef:
@@ -50,11 +50,6 @@ spec:
                 secretKeyRef:
                   name: prs-env-prod
                   key: GEOSERVER_SSO_PASS
-            - name: GEOCODER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: prs-env-prod
-                  key: GEOCODER_URL
             - name: SLIP_ESRI_FS_URL
               valueFrom:
                 secretKeyRef:

diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -29,26 +29,31 @@ spec:
             secretKeyRef:
               name: prs-env-prod
               key: SECRET_KEY
-        - name: PRS_GEOSERVER_WMTS_URL
+        - name: PRS_GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-prod
-              key: PRS_GEOSERVER_WMTS_URL
-        - name: PRS_GEOSERVER_WFS_URL
+              key: PRS_GEOSERVER_URL
+        - name: MAPPROXY_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-prod
-              key: PRS_GEOSERVER_WFS_URL
-        - name: GEOSERVER_WMTS_URL
+              key: MAPPROXY_URL
+        - name: GEOCODER_URL
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-prod
+              key: GEOCODER_URL
+        - name: GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-prod
-              key: GEOSERVER_WMTS_URL
-        - name: GEOSERVER_WFS_URL
+              key: GEOSERVER_URL
+        - name: CADASTRE_LAYER_NAME
           valueFrom:
             secretKeyRef:
               name: prs-env-prod
-              key: GEOSERVER_WFS_URL
+              key: CADASTRE_LAYER_NAME
         - name: GEOSERVER_SSO_USER
           valueFrom:
             secretKeyRef:
@@ -59,11 +64,6 @@ spec:
             secretKeyRef:
               name: prs-env-prod
               key: GEOSERVER_SSO_PASS
-        - name: GEOCODER_URL
-          valueFrom:
-            secretKeyRef:
-              name: prs-env-prod
-              key: GEOCODER_URL
         - name: SLIP_ESRI_FS_URL
           valueFrom:
             secretKeyRef:

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/prs
-    newTag: 2.5.35
+    newTag: 2.5.36
diff --git a/kustomize/overlays/uat/cronjobs/harvest-email-referrals/patch.yaml b/kustomize/overlays/uat/cronjobs/harvest-email-referrals/patch.yaml
@@ -20,26 +20,21 @@ spec:
                 secretKeyRef:
                   name: prs-env-uat
                   key: DATABASE_URL
-            - name: PRS_GEOSERVER_WMTS_URL
+            - name: PRS_GEOSERVER_URL
               valueFrom:
                 secretKeyRef:
                   name: prs-env-uat
-                  key: PRS_GEOSERVER_WMTS_URL
-            - name: PRS_GEOSERVER_WFS_URL
+                  key: PRS_GEOSERVER_URL
+            - name: GEOSERVER_URL
               valueFrom:
                 secretKeyRef:
                   name: prs-env-uat
-                  key: PRS_GEOSERVER_WFS_URL
-            - name: GEOSERVER_WMTS_URL
+                  key: GEOSERVER_URL
+            - name: CADASTRE_LAYER_NAME
               valueFrom:
                 secretKeyRef:
                   name: prs-env-uat
-                  key: GEOSERVER_WMTS_URL
-            - name: GEOSERVER_WFS_URL
-              valueFrom:
-                secretKeyRef:
-                  name: prs-env-uat
-                  key: GEOSERVER_WFS_URL
+                  key: CADASTRE_LAYER_NAME
             - name: GEOSERVER_SSO_USER
               valueFrom:
                 secretKeyRef:
@@ -50,11 +45,6 @@ spec:
                 secretKeyRef:
                   name: prs-env-uat
                   key: GEOSERVER_SSO_PASS
-            - name: GEOCODER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: prs-env-uat
-                  key: GEOCODER_URL
             - name: SLIP_ESRI_FS_URL
               valueFrom:
                 secretKeyRef:

diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -28,26 +28,31 @@ spec:
             secretKeyRef:
               name: prs-env-uat
               key: SECRET_KEY
-        - name: PRS_GEOSERVER_WMTS_URL
+        - name: PRS_GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-uat
-              key: PRS_GEOSERVER_WMTS_URL
-        - name: PRS_GEOSERVER_WFS_URL
+              key: PRS_GEOSERVER_URL
+        - name: MAPPROXY_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-uat
-              key: PRS_GEOSERVER_WFS_URL
-        - name: GEOSERVER_WMTS_URL
+              key: MAPPROXY_URL
+        - name: GEOCODER_URL
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-uat
+              key: GEOCODER_URL
+        - name: GEOSERVER_URL
           valueFrom:
             secretKeyRef:
               name: prs-env-uat
-              key: GEOSERVER_WMTS_URL
-        - name: GEOSERVER_WFS_URL
+              key: GEOSERVER_URL
+        - name: CADASTRE_LAYER_NAME
           valueFrom:
             secretKeyRef:
               name: prs-env-uat
-              key: GEOSERVER_WFS_URL
+              key: CADASTRE_LAYER_NAME
         - name: GEOSERVER_SSO_USER
           valueFrom:
             secretKeyRef:
@@ -58,11 +63,6 @@ spec:
             secretKeyRef:
               name: prs-env-uat
               key: GEOSERVER_SSO_PASS
-        - name: GEOCODER_URL
-          valueFrom:
-            secretKeyRef:
-              name: prs-env-uat
-              key: GEOCODER_URL
         - name: SLIP_ESRI_FS_URL
           valueFrom:
             secretKeyRef: