From 30795ee66714285e896334d6df47ccc775b9dda4 Mon Sep 17 00:00:00 2001 From: baalmart Date: Fri, 13 Dec 2024 15:04:31 +0300 Subject: [PATCH 01/16] just updating the metadata for query mappings --- src/device-registry/config/global/mappings.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/device-registry/config/global/mappings.js b/src/device-registry/config/global/mappings.js index 01bc44ae97..f9c4b62e6a 100644 --- 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"], From 001fc08a58aadc2e9c55f5a1506886d188a78bf4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:12:47 +0300 Subject: [PATCH 02/16] Update device registry staging image tag to stage-c54fd122-1734091882 --- k8s/device-registry/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml index c24cd08854..fd13e51825 100644 --- 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: {} From 3640d9dd22a3597883a3b3618f3a8956b9bb9de9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:16:49 +0300 Subject: [PATCH 03/16] Update AirQo exceedance production image tag to prod-7c9244bc-1734092169 --- k8s/exceedance/values-prod-airqo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/exceedance/values-prod-airqo.yaml b/k8s/exceedance/values-prod-airqo.yaml index e76a72c5c2..e6df26b109 100644 --- 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: '' From b3650e23338b182615e71b4b5d75a9798c083d7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:16:57 +0300 Subject: [PATCH 04/16] Update KCCA exceedance production image tag to prod-7c9244bc-1734092169 --- k8s/exceedance/values-prod-kcca.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml index 5b8964cb9c..6c056ea15d 100644 --- 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-7c9244bc-1734092169 nameOverride: '' fullnameOverride: '' From f68c62c4093993ddcb1175e4e70cf4aa56d0615f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:17:36 +0300 Subject: [PATCH 05/16] Update auth service production image tag to prod-7c9244bc-1734092169 --- k8s/auth-service/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml index 9b20ee6db7..1545b4f160 100644 --- 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-7c9244bc-1734092169 nameOverride: '' fullnameOverride: '' podAnnotations: {} From fdcad8e3044abfc0b267cc31778454347e9ca5fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:17:55 +0300 Subject: [PATCH 06/16] Update device registry production image tag to prod-7c9244bc-1734092169 --- k8s/device-registry/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml index 10e1d25849..cf4a5d2ec7 100644 --- 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-7c9244bc-1734092169 nameOverride: '' fullnameOverride: '' podAnnotations: {} From ea2c422c2291d9e00732ed8e937375274232443d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:18:05 +0300 Subject: [PATCH 07/16] Update website production image tag to prod-7c9244bc-1734092169 --- k8s/website/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/website/values-prod.yaml b/k8s/website/values-prod.yaml index b211da4f8b..3705e0571d 100644 --- 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: {} From fcfda1de15bdf030a9e303c4a583493a87ef2727 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:18:37 +0300 Subject: [PATCH 08/16] Update workflows prod image tag to prod-7c9244bc-1734092169 --- k8s/workflows/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml index f7d03f69ac..9f2ef88171 100644 --- 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-7c9244bc-1734092169 nameOverride: '' fullnameOverride: '' podAnnotations: {} From e2571004b50efc0db3fe5474d627642536c855b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:19:07 +0300 Subject: [PATCH 09/16] Update analytics production image tag to prod-7c9244bc-1734092169 --- k8s/analytics/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml index 241d49ec81..4589ad8320 100644 --- 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 From c3a2e46ec3663e38a8e2a829d5e7116a7014fb39 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:19:38 +0300 Subject: [PATCH 10/16] Update predict production image tag to prod-7c9244bc-1734092169 --- k8s/predict/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml index 10a70428d1..65d41f96d0 100644 --- 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 From 1ad845ba4df0b797059b60c793ffff812f6883d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:23:29 +0300 Subject: [PATCH 11/16] Update workflows staging image tag to stage-78c653a5-1734092306 --- k8s/workflows/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml index 9ee4d99d8c..d95ffbd0c5 100644 --- 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: {} From 4b7f426b8b926eb731ff67161776fc42b43f0a85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:23:41 +0300 Subject: [PATCH 12/16] Update auth service production image tag to prod-a00e783d-1734092401 --- k8s/auth-service/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml index 1545b4f160..21988f388d 100644 --- 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-7c9244bc-1734092169 + tag: prod-a00e783d-1734092401 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 7028c34737719de2750c8ef24ccc375a4d10137a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:24:02 +0300 Subject: [PATCH 13/16] Update device registry production image tag to prod-a00e783d-1734092401 --- k8s/device-registry/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml index cf4a5d2ec7..459bbe042c 100644 --- 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-7c9244bc-1734092169 + tag: prod-a00e783d-1734092401 nameOverride: '' fullnameOverride: '' podAnnotations: {} From ffdbe1ba503caeff5b12c4940926dce3d7c18f1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:24:13 +0300 Subject: [PATCH 14/16] Update KCCA exceedance production image tag to prod-a00e783d-1734092401 --- k8s/exceedance/values-prod-kcca.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml index 6c056ea15d..036954a295 100644 --- 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-7c9244bc-1734092169 + tag: prod-a00e783d-1734092401 nameOverride: '' fullnameOverride: '' From 23fe718150de23a62cfc54f74e92c4b0fb488346 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:24:52 +0300 Subject: [PATCH 15/16] Update workflows prod image tag to prod-a00e783d-1734092401 --- k8s/workflows/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml index 9f2ef88171..ee33937c6a 100644 --- 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-7c9244bc-1734092169 + tag: prod-a00e783d-1734092401 nameOverride: '' fullnameOverride: '' podAnnotations: {} From d8cdae16bc83815376513e71ff6259d9950c3573 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:26:00 +0300 Subject: [PATCH 16/16] Update spatial production image tag to prod-7c9244bc-1734092169 --- k8s/spatial/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml index 70aa0c11a5..4702789651 100644 --- 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: {}