Merge pull request #197 from ropable/master

Tweaks to Kustomize definitions
dbca-wa · Nov 3, 2023 · 69ce445 · 69ce445
2 parents d8913a3 + d59363b
commit 69ce445
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 14 deletions.
diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -52,5 +52,12 @@ spec:
           capabilities:
             drop:
               - ALL
-          readOnlyRootFilesystem: false
+          readOnlyRootFilesystem: true
+        volumeMounts:
+          - mountPath: /tmp
+            name: tmpfs-ram
+      volumes:
+        - name: tmpfs-ram
+          emptyDir:
+            medium: "Memory"
       restartPolicy: Always
diff --git a/kustomize/overlays/prod/cronjobs/harvest-dfes/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-dfes/patch.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
+            imagePullPolicy: IfNotPresent
             args: ["manage.py", "harvest_dfes_feed"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/prod/cronjobs/harvest-email-iriditrak/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-email-iriditrak/patch.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
+            imagePullPolicy: IfNotPresent
             args: ["manage.py", "harvest_tracking_email", "--device-type", "iriditrak", "--purge-email"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/prod/cronjobs/harvest-email-mp70/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-email-mp70/patch.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
+            imagePullPolicy: IfNotPresent
             args: ["manage.py", "harvest_tracking_email", "--device-type", "mp70", "--purge-email"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/prod/cronjobs/harvest-email-spot/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-email-spot/patch.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
+            imagePullPolicy: IfNotPresent
             args: ["manage.py", "harvest_tracking_email", "--device-type", "spot", "--purge-email"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/prod/cronjobs/harvest-tracplus/patch.yaml b/kustomize/overlays/prod/cronjobs/harvest-tracplus/patch.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
+            imagePullPolicy: IfNotPresent
             args: ["manage.py", "harvest_tracplus"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/uat/cronjobs/harvest-dfes/patch.yaml b/kustomize/overlays/uat/cronjobs/harvest-dfes/patch.yaml
@@ -10,7 +10,6 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
             args: ["manage.py", "harvest_dfes_feed"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/uat/cronjobs/harvest-email-iriditrak/patch.yaml b/kustomize/overlays/uat/cronjobs/harvest-email-iriditrak/patch.yaml
@@ -10,7 +10,6 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
             args: ["manage.py", "harvest_tracking_email", "--device-type", "iriditrak"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/uat/cronjobs/harvest-email-mp70/patch.yaml b/kustomize/overlays/uat/cronjobs/harvest-email-mp70/patch.yaml
@@ -10,7 +10,6 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
             args: ["manage.py", "harvest_tracking_email", "--device-type", "mp70"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/overlays/uat/cronjobs/harvest-tracplus/patch.yaml b/kustomize/overlays/uat/cronjobs/harvest-tracplus/patch.yaml
@@ -10,7 +10,6 @@ spec:
         spec:
           containers:
           - name: resourcetracking-cronjob
-            imagePullPolicy: Always
             args: ["manage.py", "harvest_tracplus"]
             env:
             - name: DATABASE_URL

diff --git a/kustomize/template/cronjob.yaml b/kustomize/template/cronjob.yaml
@@ -15,9 +15,12 @@ spec:
           containers:
           - name: resourcetracking-cronjob
             image: ghcr.io/dbca-wa/resource_tracking
-            imagePullPolicy: IfNotPresent
+            imagePullPolicy: Always
             command: ["python"]
             args: ["--version"]
+            env:
+            - name: TZ
+              value: "Australia/Perth"
             securityContext:
               runAsNonRoot: true
               privileged: false

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,6 +20,7 @@ unicodecsv = "0.14.1"
 whitenoise = {version = "6.5.0", extras = ["brotli"]}
 azure-storage-blob = "12.17.0"
 sentry-sdk = {version = "1.32.0", extras = ["django"]}
+tomli = "2.0.1"
 
 [tool.poetry.group.dev.dependencies]
 ipython = "^8.13.0"

diff --git a/resource_tracking/settings.py b/resource_tracking/settings.py
@@ -153,11 +153,12 @@
 SENTRY_ENVIRONMENT = env('SENTRY_ENVIRONMENT', None)
 if SENTRY_DSN and SENTRY_ENVIRONMENT:
     import sentry_sdk
-    from importlib import metadata
+    import tomli
+    project = tomli.load(open(os.path.join(BASE_DIR, "pyproject.toml"), "rb"))
 
     sentry_sdk.init(
         dsn=SENTRY_DSN,
         traces_sample_rate=SENTRY_SAMPLE_RATE,
         environment=SENTRY_ENVIRONMENT,
-        release=metadata.version("resource_tracking"),
+        release=project["tool"]["poetry"]["version"],
     )