Merge pull request #573 from ropable/master

Updates related to Surveys, register TissueSampleObservation in admin, Kustomize HPAs, present/absent -> yes/no, additional ODK import
dbca-wa · May 3, 2024 · 9aade5a · 9aade5a
2 parents 1228888 + 2803d3b
commit 9aade5a
Show file tree

Hide file tree

Showing 60 changed files with 2,296 additions and 822 deletions.
diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -8,7 +8,6 @@ spec:
   selector:
     matchLabels:
       app: turtles-deployment
-  replicas: 2
   strategy:
     type: RollingUpdate
   template:

diff --git a/kustomize/base/deployment_hpa.yaml b/kustomize/base/deployment_hpa.yaml
@@ -0,0 +1,17 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: turtles-deployment-hpa
+spec:
+  minReplicas: 1
+  maxReplicas: 3
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+  metrics:
+    - resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 250
+      type: Resource
diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - deployment.yaml
+  - deployment_hpa.yaml
   - service.yaml
diff --git a/kustomize/overlays/prod/cronjobs/automated-qa/patch.yaml b/kustomize/overlays/prod/cronjobs/automated-qa/patch.yaml
@@ -7,6 +7,7 @@ spec:
   schedule: "30 4 * * *"
   jobTemplate:
     spec:
+      activeDeadlineSeconds: 300
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/prod/cronjobs/download-odk/patch.yaml b/kustomize/overlays/prod/cronjobs/download-odk/patch.yaml
@@ -7,8 +7,6 @@ spec:
   schedule: "0 4 * * *"
   jobTemplate:
     spec:
-      # Allow up to 15 minutes for completion.
-      activeDeadlineSeconds: 900
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/prod/cronjobs/reconstruct-missing-surveys/patch.yaml b/kustomize/overlays/prod/cronjobs/reconstruct-missing-surveys/patch.yaml
@@ -7,6 +7,7 @@ spec:
   schedule: "0 14 * * *"
   jobTemplate:
     spec:
+      activeDeadlineSeconds: 300
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/prod/deployment_hpa_patch.yaml b/kustomize/overlays/prod/deployment_hpa_patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: turtles-deployment-hpa
+spec:
+  scaleTargetRef:
+    name: turtles-deployment-prod
diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -8,8 +8,6 @@ spec:
       containers:
       - name: turtles
         env:
-        - name: MAPPROXY_URL
-          value: "https://mapproxy.dbca.wa.gov.au"
         - name: SITE_CODE
           value: "Turtles"
         - name: SITE_NAME
@@ -31,6 +29,16 @@ spec:
             secretKeyRef:
               name: turtles-env-prod
               key: SECRET_KEY
+        - name: MAPPROXY_URL
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-prod
+              key: MAPPROXY_URL
+        - name: MAPBOX_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-prod
+              key: MAPBOX_TOKEN
         - name: AZURE_ACCOUNT_NAME
           valueFrom:
             secretKeyRef:
@@ -116,5 +124,10 @@ spec:
             secretKeyRef:
               name: turtles-env-prod
               key: SENTRY_TRANSACTION_SAMPLE_RATE
+        - name: SENTRY_PROFILES_SAMPLE_RATE
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-prod
+              key: SENTRY_PROFILES_SAMPLE_RATE
         - name: SENTRY_ENVIRONMENT
           value: "prod"
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
@@ -19,7 +19,8 @@ labels:
     includeSelectors: true
 patches:
   - path: deployment_patch.yaml
+  - path: deployment_hpa_patch.yaml
   - path: service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/wastd
-    newTag: 2.0.1
+    newTag: 2.0.2
diff --git a/kustomize/overlays/uat/cronjobs/automated-qa/patch.yaml b/kustomize/overlays/uat/cronjobs/automated-qa/patch.yaml
@@ -7,6 +7,7 @@ spec:
   schedule: "30 4 * * *"
   jobTemplate:
     spec:
+      activeDeadlineSeconds: 300
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/uat/cronjobs/download-odk/patch.yaml b/kustomize/overlays/uat/cronjobs/download-odk/patch.yaml
@@ -7,8 +7,6 @@ spec:
   schedule: "0 4 * * *"
   jobTemplate:
     spec:
-      # Allow up to 15 minutes for completion.
-      activeDeadlineSeconds: 900
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/uat/cronjobs/reconstruct-missing-surveys/patch.yaml b/kustomize/overlays/uat/cronjobs/reconstruct-missing-surveys/patch.yaml
@@ -7,6 +7,7 @@ spec:
   schedule: "0 14 * * *"
   jobTemplate:
     spec:
+      activeDeadlineSeconds: 300
       template:
         spec:
           containers:

diff --git a/kustomize/overlays/uat/deployment_hpa_patch.yaml b/kustomize/overlays/uat/deployment_hpa_patch.yaml
@@ -0,0 +1,7 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: turtles-deployment-hpa
+spec:
+  scaleTargetRef:
+    name: turtles-deployment-uat
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -8,8 +8,6 @@ spec:
       containers:
       - name: turtles
         env:
-        - name: MAPPROXY_URL
-          value: "https://mapproxy.dbca.wa.gov.au/service"
         - name: SITE_CODE
           value: "Turtles UAT"
         - name: SITE_NAME
@@ -31,6 +29,16 @@ spec:
             secretKeyRef:
               name: turtles-env-uat
               key: SECRET_KEY
+        - name: MAPPROXY_URL
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-uat
+              key: MAPPROXY_URL
+        - name: MAPBOX_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-uat
+              key: MAPBOX_TOKEN
         - name: AZURE_ACCOUNT_NAME
           valueFrom:
             secretKeyRef:
@@ -116,5 +124,10 @@ spec:
             secretKeyRef:
               name: turtles-env-uat
               key: SENTRY_TRANSACTION_SAMPLE_RATE
+        - name: SENTRY_PROFILES_SAMPLE_RATE
+          valueFrom:
+            secretKeyRef:
+              name: turtles-env-uat
+              key: SENTRY_PROFILES_SAMPLE_RATE
         - name: SENTRY_ENVIRONMENT
           value: "uat"
diff --git a/kustomize/overlays/uat/kustomization.yaml b/kustomize/overlays/uat/kustomization.yaml
@@ -19,4 +19,5 @@ labels:
     includeSelectors: true
 patches:
   - path: deployment_patch.yaml
+  - path: deployment_hpa_patch.yaml
   - path: service_patch.yaml
diff --git a/kustomize/template/cronjob.yaml b/kustomize/template/cronjob.yaml
@@ -10,7 +10,6 @@ spec:
   jobTemplate:
     spec:
       parallelism: 1
-      activeDeadlineSeconds: 300
       template:
         spec:
           restartPolicy: Never

diff --git a/marine_mammal_incidents/apps.py b/marine_mammal_incidents/apps.py
@@ -4,3 +4,4 @@
 class MarineMammalIncidentsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'marine_mammal_incidents'
+    verbose_name = 'Marine mammal incidents'