Merge pull request #756 from bcgov/dev

Kashike-Umemura · web-flow · commit 91bc07c89b67 · 2026-01-06T09:15:17.000-08:00
MSP Scraper Fixes
diff --git a/airflow/etl_pipelines/scrapers/StationObservationPipeline/StationObservationPipeline.py b/airflow/etl_pipelines/scrapers/StationObservationPipeline/StationObservationPipeline.py
@@ -181,6 +181,11 @@ def download_data(self):
 
             # Remove any leading or trailing whitespaces:
             data_df = data_df.rename(str.strip)
+            # Since from here on out the columns will be the stripped ones, if they have changed
+            # our schema_overrides from above may not have applied
+            # Perform CAST-ing as necessary
+            if(key in self.expected_dtype and self.name != "ASP"):
+                data_df = data_df.cast(self.expected_dtype[key], strict=False)
 
             # __downloaded_data contains the path to the downloaded data if go_through_all_stations is False
             if not self.go_through_all_stations:
diff --git a/airflow/pod_templates/okd/heavy_task_template.yaml b/airflow/pod_templates/okd/heavy_task_template.yaml
@@ -30,17 +30,17 @@ spec:
         - name: AIRFLOW__CORE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__DATABASE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW_CONN_AIRFLOW_DB
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__WEBSERVER__SECRET_KEY
           valueFrom:
diff --git a/airflow/pod_templates/okd/largest_task_template.yaml b/airflow/pod_templates/okd/largest_task_template.yaml
@@ -30,17 +30,17 @@ spec:
         - name: AIRFLOW__CORE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__DATABASE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW_CONN_AIRFLOW_DB
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__WEBSERVER__SECRET_KEY
           valueFrom:
diff --git a/airflow/pod_templates/okd/medium_task_template.yaml b/airflow/pod_templates/okd/medium_task_template.yaml
@@ -30,17 +30,17 @@ spec:
         - name: AIRFLOW__CORE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__DATABASE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW_CONN_AIRFLOW_DB
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__WEBSERVER__SECRET_KEY
           valueFrom:
diff --git a/airflow/pod_templates/okd/small_task_template.yaml b/airflow/pod_templates/okd/small_task_template.yaml
@@ -30,17 +30,17 @@ spec:
         - name: AIRFLOW__CORE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__DATABASE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW_CONN_AIRFLOW_DB
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__WEBSERVER__SECRET_KEY
           valueFrom:
diff --git a/airflow/pod_templates/okd/tiny_task_template.yaml b/airflow/pod_templates/okd/tiny_task_template.yaml
@@ -30,17 +30,17 @@ spec:
         - name: AIRFLOW__CORE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__DATABASE__SQL_ALCHEMY_CONN
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW_CONN_AIRFLOW_DB
           valueFrom:
             secretKeyRef:
-              name: bcwat-airflow-metadata
+              name: airflow-database-connection
               key: connection
         - name: AIRFLOW__WEBSERVER__SECRET_KEY
           valueFrom:
diff --git a/charts/okd/airflow/README.md b/charts/okd/airflow/README.md
@@ -10,15 +10,15 @@ Currently, the only release that exists is on the Foundry OKD. Therefore, the on
 
 To initialize viewing the logs within , a Persistent Volume and Storage Class MUST be initialized for the Persistent Volume Claim to be enabled.
 
-A secret must be created in the `bcwat` namespace titled `bcwat-airflow-metadata`. This holds a key value pair containing the connection information for the airflow metadata database.
+A secret must be created in the `bcwat` namespace titled `airflow-conn-bcwat-db`. This holds a key value pair containing the connection information for the airflow metadata database.
 
 This database is required for airflow, and will be populated via the migrate databases job that occurs during the helm upgrade.
 
 ```bash
 apiVersion: v1
 kind: Secret
 metadata:
-  name: bcwat-airflow-metadata
+  name: airflow-conn-bcwat-db
   namespace: bcwat
 type: Opaque
 stringData:
diff --git a/charts/okd/airflow/values.yaml b/charts/okd/airflow/values.yaml
@@ -37,26 +37,6 @@ images:
     tag: latest
     pullPolicy: Always
 
-migrateDatabaseJob:
-  env:
-    - name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
-      value: "False"
-  securityContext:
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-  ttlSecondsAfterFinished: 180
-
-createUserJob:
-  env:
-    - name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
-      value: "False"
-  securityContext:
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-  ttlSecondsAfterFinished: 180
-
 redis:
   enabled: false
 
@@ -79,13 +59,31 @@ logs:
     enabled: true
     storageClassName: airflow
 
+migrateDatabaseJob:
+  useHelmHooks: false
+  env:
+    - name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
+      value: "False"
+  securityContext:
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+  ttlSecondsAfterFinished: 180
+
+createUserJob:
+  useHelmHooks: false
+  env:
+    - name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
+      value: "False"
+  securityContext:
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+  ttlSecondsAfterFinished: 180
+
 webserver:
-  livenessProbe:
-    initialDelaySeconds: 60
-  readinessProbe:
-    initialDelaySeconds: 60
   startupProbe:
-    initialDelaySeconds: 30
+    timeoutSeconds: 60
   env:
     - name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
       value: "False"
@@ -116,7 +114,7 @@ webserver:
           cpu: 50m
           memory: 75Mi
   waitForMigrations:
-    enabled: false
+    enabled: true
   securityContext:
     runAsNonRoot: true
     seccompProfile:
@@ -129,7 +127,7 @@ scheduler:
     - name: ENVIRONMENT
       value: OKD
   waitForMigrations:
-    enabled: false
+    enabled: true
   securityContext:
     runAsNonRoot: true
     seccompProfile:
@@ -144,7 +142,7 @@ triggerer:
   persistence:
     enabled: false
   waitForMigrations:
-    enabled: false
+    enabled: true
   securityContext:
     runAsNonRoot: true
     seccompProfile:
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bc-wat-app",
     "private": true,
-    "version": "4.11.1",
+    "version": "4.11.11",
     "type": "module",
     "scripts": {
         "dev": "vite",
diff --git a/client/src/components/ReportChart.vue b/client/src/components/ReportChart.vue
@@ -556,13 +556,19 @@ const addTooltipText = (pos) => {
                     value: data.min,
                     bg: year.color,
                 });
+            } else if (props.chartType === 'precipitation') {
+                tooltipText.value.push({
+                    label: `${year.label} Monthly Total`,
+                    value: data.v,
+                    bg: year.color,
+                });
             } else {
-            tooltipText.value.push({
-                label: `${year.label} Daily Mean`,
-                value: data.v,
-                bg: year.color,
-            });
-        }
+                tooltipText.value.push({
+                    label: `${year.label} Daily Mean`,
+                    value: data.v,
+                    bg: year.color,
+                });
+            }
     });
 }
 };
diff --git a/migrations/.dockerignore b/migrations/.dockerignore
@@ -4,3 +4,4 @@ coverage
 cypress
 dist
 node_modules
+flyway.conf
diff --git a/migrations/.gitignore b/migrations/.gitignore
@@ -0,0 +1 @@
+flyway.conf
diff --git a/migrations/flyway.conf.example b/migrations/flyway.conf.example
@@ -0,0 +1,6 @@
+flyway.url=
+flyway.user=
+flyway.password=
+flyway.locations=
+flyway.schemas=public,bcwat_lic,bcwat_obs,bcwat_ws
+flyway.defaultSchema=public

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bc-wat-app",`
`3`	`3`	`"private": true,`
`4`		`- "version": "4.11.1",`
	`4`	`+ "version": "4.11.11",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite",`