From 9181beab8afa5a3535da27e89bfbb27d4fad7036 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:42:31 +0300 Subject: [PATCH 1/8] Update auth service staging image tag to stage-9c5e5eb9-1706226064 --- k8s/auth-service/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/auth-service/values-stage.yaml b/k8s/auth-service/values-stage.yaml index 889bece30b..b885f502f4 100644 --- a/k8s/auth-service/values-stage.yaml +++ b/k8s/auth-service/values-stage.yaml @@ -6,7 +6,7 @@ app: replicaCount: 2 image: repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api - tag: stage-f47db6d2-1706169741 + tag: stage-9c5e5eb9-1706226064 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 79b8987132dfc44d89a2a7bac4ec52b36bc17908 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:43:35 +0300 Subject: [PATCH 2/8] Update data proxy production image tag to prod-0daa6308-1706226127 --- k8s/data-proxy/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/data-proxy/values-prod.yaml b/k8s/data-proxy/values-prod.yaml index 2acae9a73b..669c8b2d97 100644 --- a/k8s/data-proxy/values-prod.yaml +++ b/k8s/data-proxy/values-prod.yaml @@ -6,7 +6,7 @@ app: replicaCount: 2 image: repository: eu.gcr.io/airqo-250220/airqo-data-proxy-api - tag: prod-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 nameOverride: '' fullnameOverride: '' podAnnotations: {} From e9ca2e2c03644d67329e9b06ef9c2e6441e4a096 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:43:57 +0300 Subject: [PATCH 3/8] Update auth service production image tag to prod-0daa6308-1706226127 --- 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 0eecca5c8e..966b57665a 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-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 nameOverride: '' fullnameOverride: '' podAnnotations: {} From dee40bb93d21fea6059dedde0160ce70431660b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:44:02 +0300 Subject: [PATCH 4/8] Update device registry production image tag to prod-0daa6308-1706226127 --- 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 40da4cfda5..eb6a73a2d7 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-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 23b54199131473cf500abc12d57510e0e857e519 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:45:28 +0300 Subject: [PATCH 5/8] Update workflows prod image tag to prod-0daa6308-1706226127 --- 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 99a345bc74..5063363144 100644 --- a/k8s/workflows/values-prod.yaml +++ b/k8s/workflows/values-prod.yaml @@ -9,7 +9,7 @@ images: repositories: initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom containers: eu.gcr.io/airqo-250220/airqo-workflows - tag: prod-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 27bbda24157f9e4ee60a2541f19b754aabb71fe3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:45:36 +0300 Subject: [PATCH 6/8] Update gp-model production image tag to prod-0daa6308-1706226127 --- k8s/gp-model/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/gp-model/values-prod.yaml b/k8s/gp-model/values-prod.yaml index 27c35745a4..3207a0b0f5 100644 --- a/k8s/gp-model/values-prod.yaml +++ b/k8s/gp-model/values-prod.yaml @@ -6,7 +6,7 @@ app: namespace: production configMap: env-gp-model-production images: - tag: prod-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 repositories: cronJob: eu.gcr.io/airqo-250220/airqo-gp-model-job brokerConsumer: eu.gcr.io/airqo-250220/airqo-gp-model-broker-consumer From 7c1843d8d8c997e5c9cdcea7540f6c3ad974c081 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 02:46:15 +0300 Subject: [PATCH 7/8] Update predict production image tag to prod-0daa6308-1706226127 --- 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 9487b17f67..a5771ba9f7 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-ae9b1fab-1706224159 + tag: prod-0daa6308-1706226127 api: name: airqo-prediction-api label: prediction-api From eb3280c2e69d156461581f916453a8225d6596c2 Mon Sep 17 00:00:00 2001 From: baalmart Date: Fri, 26 Jan 2024 10:23:55 +0300 Subject: [PATCH 8/8] undo previous change for site number in Grids --- src/device-registry/utils/create-grid.js | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/device-registry/utils/create-grid.js b/src/device-registry/utils/create-grid.js index f5f16764cc..af3694e29c 100644 --- a/src/device-registry/utils/create-grid.js +++ b/src/device-registry/utils/create-grid.js @@ -267,27 +267,27 @@ const createGrid = { } // Remove old grid_ids from sites - // const pullResponse = await SiteModel(tenant).updateMany( - // { - // _id: { $in: batchSiteIds }, - // grids: { $ne: grid_id.toString() }, - // }, - // { - // $pull: { grids: { $ne: grid_id.toString() } }, - // } - // ); - - // Remove the Grid from Sites which no longer have devices deployed to them const pullResponse = await SiteModel(tenant).updateMany( { - _id: { $nin: batchSiteIds }, // Select sites not in batchSiteIds - grids: { $in: [grid_id.toString()] }, // Select sites that contain the grid_id + _id: { $in: batchSiteIds }, + grids: { $ne: grid_id.toString() }, }, { - $pull: { grids: grid_id.toString() }, // Remove grid_id from the selected sites + $pull: { grids: { $ne: grid_id.toString() } }, } ); + // Remove the Grid from Sites which no longer have devices deployed to them + // const pullResponse = await SiteModel(tenant).updateMany( + // { + // _id: { $nin: batchSiteIds }, // Select sites not in batchSiteIds + // grids: { $in: [grid_id.toString()] }, // Select sites that contain the grid_id + // }, + // { + // $pull: { grids: grid_id.toString() }, // Remove grid_id from the selected sites + // } + // ); + logObject("pullResponse", pullResponse); // Check if pull operation was successful