Merge branch 'staging' into update-fix/Clean_up

Updates from airqo staging
airqo-platform · Dec 13, 2024 · 44abcbc · 44abcbc
2 parents 5a2ac8d + d8cdae1
commit 44abcbc
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
-  tag: prod-875fce3e-1734088534
+  tag: prod-7c9244bc-1734092169
 api:
   name: airqo-analytics-api
   label: analytics-api

diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-875fce3e-1734088534
+  tag: prod-a00e783d-1734092401
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-875fce3e-1734088534
+  tag: prod-a00e783d-1734092401
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
-  tag: stage-04fa3ebc-1734023297
+  tag: stage-c54fd122-1734091882
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/exceedance/values-prod-airqo.yaml b/k8s/exceedance/values-prod-airqo.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
-  tag: prod-875fce3e-1734088534
+  tag: prod-7c9244bc-1734092169
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
-  tag: prod-875fce3e-1734088534
+  tag: prod-a00e783d-1734092401
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-875fce3e-1734088534
+  tag: prod-7c9244bc-1734092169
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-875fce3e-1734088534
+  tag: prod-7c9244bc-1734092169
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/website/values-prod.yaml b/k8s/website/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-website-api
-  tag: prod-875fce3e-1734088534
+  tag: prod-7c9244bc-1734092169
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-redis
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-875fce3e-1734088534
+  tag: prod-a00e783d-1734092401
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-stage-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
     containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
-  tag: stage-40bbbd59-1734088481
+  tag: stage-78c653a5-1734092306
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/device-registry/config/global/mappings.js b/src/device-registry/config/global/mappings.js
@@ -38,11 +38,15 @@ const mappings = {
     NETWORKS: ["metone", "usembassy"],
     COMBINATIONS: {
       NETWORK_PAIRS: [
-        ["metone", "usembassy", "us_embassy"],
+        ["metone", "usembassy", "us_embassy", "us-embassy"],
         ["kcca", "clarity"],
         ["urbanbetter", "airbeam", "urban_better"],
       ],
-      GROUP_PAIRS: [["metone", "usembassy"], ["kcca", "clarity"]],
+      GROUP_PAIRS: [
+        ["us-embassy", "usembassy", "us_embassy"],
+        ["kcca", "kampala"],
+        ["urbanbetter", "urban_better", "urban-better"],
+      ],
       STATUS_PAIRS: [
         ["active", "enabled", "running"],
         ["inactive", "disabled"],