From 974eac2aa83891898af67b43089722b44d6ec54d Mon Sep 17 00:00:00 2001 From: baalmart Date: Fri, 24 Jan 2025 12:46:29 +0300 Subject: [PATCH 01/32] manually fixing a path --- src/auth-service/utils/common/mailer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/auth-service/utils/common/mailer.js b/src/auth-service/utils/common/mailer.js index 449a644aa8..99d2035e79 100644 --- a/src/auth-service/utils/common/mailer.js +++ b/src/auth-service/utils/common/mailer.js @@ -21,7 +21,8 @@ const processString = (inputString) => { return uppercasedString; }; -const projectRoot = path.join(__dirname, "..", "..", ".."); // Go three levels up +// const projectRoot = path.join(__dirname, "..", "..", ".."); // Go three levels up +const projectRoot = "/usr/src/app"; const imagePath = path.join(projectRoot, "config", "images"); let attachments = [ From 33e9f0bba8b8f25b076cba9504365bcdbab4f6a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:50:14 +0300 Subject: [PATCH 02/32] Update auth service staging image tag to stage-2eb69a3a-1737712135 --- 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 d61a699624..bb8318e232 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-339ecca6-1737613974 + tag: stage-2eb69a3a-1737712135 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 14f47902dbde74c81e24d8d92f8c0ec1daa33cd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:50:26 +0300 Subject: [PATCH 03/32] Update AirQo exceedance production image tag to prod-08366688-1737712174 --- 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 2b02fdf7ac..35f2c8539f 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' From 5c5593d68a98642d93c9270103f196c4e0ee320d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:50:35 +0300 Subject: [PATCH 04/32] Update KCCA exceedance production image tag to prod-08366688-1737712174 --- 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 d39cb9f25b..c346d53c5c 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' From c0139936c75409b00ce532b98ff5e95ca3f7a20a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:50:52 +0300 Subject: [PATCH 05/32] Update incentives production image tag to prod-08366688-1737712174 --- k8s/incentives/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/incentives/values-prod.yaml b/k8s/incentives/values-prod.yaml index 036f404abd..f52a58673c 100644 --- a/k8s/incentives/values-prod.yaml +++ b/k8s/incentives/values-prod.yaml @@ -6,7 +6,7 @@ app: replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-incentives-api - tag: prod-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 569a89990c6ff5d91e4153f87cd5ce8f922e4234 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:51:20 +0300 Subject: [PATCH 06/32] Update auth service production image tag to prod-08366688-1737712174 --- 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 c8da9cec4c..1a8e6a9558 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 2333c445752c1ffafa4b0705d6d946af4daac809 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:51:23 +0300 Subject: [PATCH 07/32] Update device registry production image tag to prod-08366688-1737712174 --- 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 752b11fdf4..08b6a46ab6 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 7f03c44e6aee03f749cd7894636ed7b98d39d40c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:51:39 +0300 Subject: [PATCH 08/32] Update calibrate production tags to prod-08366688-1737712174 --- k8s/calibrate/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/calibrate/values-prod.yaml b/k8s/calibrate/values-prod.yaml index eff6ed3d86..33bd0a4e75 100644 --- a/k8s/calibrate/values-prod.yaml +++ b/k8s/calibrate/values-prod.yaml @@ -6,11 +6,11 @@ app: initContainer: image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file - tag: prod-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-api - tag: prod-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 1bc08b0b1063d45555e3991386e2481bd278d75f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:52:18 +0300 Subject: [PATCH 09/32] Update spatial production image tag to prod-08366688-1737712174 --- 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 f3a93a791a..4b3b08d4a7 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 77d4ff6126af74800001954cd0f92b2fb111d126 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:53:18 +0300 Subject: [PATCH 10/32] Update predict production image tag to prod-08366688-1737712174 --- 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 26b08bd16f..7108d4df0b 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-0a13d9f7-1737623111 + tag: prod-08366688-1737712174 api: name: airqo-prediction-api label: prediction-api From 0d2f75be57560ffd4216e8b90683944251564674 Mon Sep 17 00:00:00 2001 From: Benjamin Ssempala <86492979+BenjaminSsempala@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:34:05 +0300 Subject: [PATCH 11/32] Modify resources for workflows containers --- k8s/workflows/values-stage.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml index 114201fa96..42ffef7d6e 100644 --- a/k8s/workflows/values-stage.yaml +++ b/k8s/workflows/values-stage.yaml @@ -17,14 +17,14 @@ podAnnotations: {} resources: webserver: requests: - cpu: 50m + cpu: 125m memory: 1000Mi limits: - cpu: 100m + cpu: 500m memory: 1500Mi scheduler: requests: - cpu: 1500m + cpu: 500m memory: 1000Mi limits: cpu: 3000m @@ -41,7 +41,7 @@ resources: cpu: 5m memory: 10Mi limits: - cpu: 50m + cpu: 100m memory: 50Mi affinity: nodeAffinity: From 941134a4bc474477186fc5e2fdbe7f8bc4e692ea Mon Sep 17 00:00:00 2001 From: baalmart Date: Fri, 24 Jan 2025 18:35:23 +0300 Subject: [PATCH 12/32] fix mailer path issues everywhere --- src/auth-service/controllers/user.controller.js | 4 +--- src/auth-service/utils/common/mailer.js | 4 ---- src/auth-service/utils/user.util.js | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/auth-service/controllers/user.controller.js b/src/auth-service/controllers/user.controller.js index e0be127751..83d98fb7ad 100644 --- a/src/auth-service/controllers/user.controller.js +++ b/src/auth-service/controllers/user.controller.js @@ -12,9 +12,7 @@ const tokenUtil = require("@utils/token.util"); const constants = require("@config/constants"); const log4js = require("log4js"); const UserModel = require("@models/User"); -const logger = log4js.getLogger( - `${constants.ENVIRONMENT} -- create-user-controller` -); +const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- user controller`); function handleResponse({ result, diff --git a/src/auth-service/utils/common/mailer.js b/src/auth-service/utils/common/mailer.js index 99d2035e79..1f1b4554bc 100644 --- a/src/auth-service/utils/common/mailer.js +++ b/src/auth-service/utils/common/mailer.js @@ -789,7 +789,6 @@ const mailer = { const subscribedBccEmails = subscribedEmails.join(","); // bcc: subscribedBccEmails, - const imagePath = path.join(__dirname, "../config/images"); let mailOptions = {}; mailOptions = { @@ -914,8 +913,6 @@ const mailer = { const subscribedBccEmails = subscribedEmails.join(","); - const imagePath = path.join(__dirname, "../config/images"); - let mailOptions = {}; mailOptions = { from: { @@ -1325,7 +1322,6 @@ const mailer = { if (!checkResult.success) { return checkResult; } - const imagePath = path.join(__dirname, "../config/images"); const mailOptions = { from: { name: constants.EMAIL_NAME, diff --git a/src/auth-service/utils/user.util.js b/src/auth-service/utils/user.util.js index 9703cefdd7..eaea86a85b 100644 --- a/src/auth-service/utils/user.util.js +++ b/src/auth-service/utils/user.util.js @@ -26,7 +26,7 @@ const redisSetAsync = util.promisify(redis.set).bind(redis); const redisExpireAsync = util.promisify(redis.expire).bind(redis); const log4js = require("log4js"); const GroupModel = require("@models/Group"); -const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- create-user-util`); +const logger = log4js.getLogger(`${constants.ENVIRONMENT} -- user util`); const { logObject, logText, HttpError } = require("@utils/shared"); const { From 2fa94bb5b65d9ffe0d950887bbead5927f8ada3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:41:05 +0300 Subject: [PATCH 13/32] Update auth service staging image tag to stage-2ec70334-1737733190 --- 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 bb8318e232..bdd2d8c0f1 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-2eb69a3a-1737712135 + tag: stage-2ec70334-1737733190 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 659a6e3cf9e933598ca732f034acb3209aa4a643 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:43:47 +0300 Subject: [PATCH 14/32] Update AirQo exceedance production image tag to prod-8cdfa8fb-1737733388 --- 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 35f2c8539f..b6412ba8b6 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-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' From f0edc4cec344654629d5d56409c197e3ebe7c3bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:43:53 +0300 Subject: [PATCH 15/32] Update KCCA exceedance production image tag to prod-8cdfa8fb-1737733388 --- 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 c346d53c5c..a5b07e60f7 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-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' From 47c8197ab3dd97ea1cf468785fe499382e9946c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:44:23 +0300 Subject: [PATCH 16/32] Update incentives production image tag to prod-8cdfa8fb-1737733388 --- k8s/incentives/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/incentives/values-prod.yaml b/k8s/incentives/values-prod.yaml index f52a58673c..21b68cd088 100644 --- a/k8s/incentives/values-prod.yaml +++ b/k8s/incentives/values-prod.yaml @@ -6,7 +6,7 @@ app: replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-incentives-api - tag: prod-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 687545852d7e2e764ae8da6ef4833b9461a8c2b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:44:30 +0300 Subject: [PATCH 17/32] Update workflows staging image tag to stage-49d537ea-1737733317 --- 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 01fd594d40..d5cee250c4 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-0450c946-1737564945 + tag: stage-49d537ea-1737733317 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 1f71f22ba03bb9e93b3c0cee2db04ea0f9276e59 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:44:45 +0300 Subject: [PATCH 18/32] Update device registry production image tag to prod-8cdfa8fb-1737733388 --- 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 08b6a46ab6..fa2e35b291 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-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 67518a0eff6e5fbfe1430e116fe64286dca84860 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:44:56 +0300 Subject: [PATCH 19/32] Update calibrate production tags to prod-8cdfa8fb-1737733388 --- k8s/calibrate/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/calibrate/values-prod.yaml b/k8s/calibrate/values-prod.yaml index 33bd0a4e75..a5d7c94097 100644 --- a/k8s/calibrate/values-prod.yaml +++ b/k8s/calibrate/values-prod.yaml @@ -6,11 +6,11 @@ app: initContainer: image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file - tag: prod-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-api - tag: prod-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 7c11c36a4d65b9fb2149221c0753e58dbe4a2610 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:45:35 +0300 Subject: [PATCH 20/32] Update auth service production image tag to prod-8cdfa8fb-1737733388 --- 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 1a8e6a9558..e144163e8f 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-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 9aad664be1225ded9d5c4bb18598eb7d0bfc7814 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:46:28 +0300 Subject: [PATCH 21/32] Update workflows prod image tag to prod-8cdfa8fb-1737733388 --- 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 e19baedf62..5998efbe49 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-c2d0e20b-1737614024 + tag: prod-8cdfa8fb-1737733388 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 710a3029c81e03d3817cf1fae1e8377fd08c2da0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:46:47 +0300 Subject: [PATCH 22/32] Update predict production image tag to prod-8cdfa8fb-1737733388 --- 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 7108d4df0b..4e191f6947 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-08366688-1737712174 + tag: prod-8cdfa8fb-1737733388 api: name: airqo-prediction-api label: prediction-api From aa94e76cbca3212ca1eccaa99c0d7fdb3f967cba Mon Sep 17 00:00:00 2001 From: baalmart Date: Fri, 24 Jan 2025 20:34:58 +0300 Subject: [PATCH 23/32] more stable approach for paths configuration --- src/auth-service/utils/common/mailer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/auth-service/utils/common/mailer.js b/src/auth-service/utils/common/mailer.js index 1f1b4554bc..a2f0a30998 100644 --- a/src/auth-service/utils/common/mailer.js +++ b/src/auth-service/utils/common/mailer.js @@ -21,8 +21,8 @@ const processString = (inputString) => { return uppercasedString; }; -// const projectRoot = path.join(__dirname, "..", "..", ".."); // Go three levels up -const projectRoot = "/usr/src/app"; +const projectRoot = path.join(__dirname, "..", ".."); // Go two levels up +// const projectRoot = "/usr/src/app"; const imagePath = path.join(projectRoot, "config", "images"); let attachments = [ From 1095d689dac72add2173216827e17107af4fa209 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:47:28 +0300 Subject: [PATCH 24/32] Update auth service staging image tag to stage-742c85bf-1737740769 --- 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 bdd2d8c0f1..f4fca8574e 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-2ec70334-1737733190 + tag: stage-742c85bf-1737740769 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 20adf34191b91eaf6880ed502d0de03867ec1dff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:47:59 +0300 Subject: [PATCH 25/32] Update AirQo exceedance production image tag to prod-19c3cb86-1737740810 --- 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 b6412ba8b6..f0ebec7930 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' From adcad06c6b555052f43d6a68e2695d372f50ecc2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:48:09 +0300 Subject: [PATCH 26/32] Update KCCA exceedance production image tag to prod-19c3cb86-1737740810 --- 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 a5b07e60f7..fe8d0ef889 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' From d33ba072120ca966fd54467ad593b9c0888a60ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:48:18 +0300 Subject: [PATCH 27/32] Update incentives production image tag to prod-19c3cb86-1737740810 --- k8s/incentives/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/incentives/values-prod.yaml b/k8s/incentives/values-prod.yaml index 21b68cd088..641aed847e 100644 --- a/k8s/incentives/values-prod.yaml +++ b/k8s/incentives/values-prod.yaml @@ -6,7 +6,7 @@ app: replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-incentives-api - tag: prod-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' podAnnotations: {} From f3ce40bf91954f4e9431512e6457fc3ac417851f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:48:42 +0300 Subject: [PATCH 28/32] Update auth service production image tag to prod-19c3cb86-1737740810 --- 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 e144163e8f..49329c27be 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 01f389587358169eb89704a8bfd2b67df45e8520 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:48:48 +0300 Subject: [PATCH 29/32] Update device registry production image tag to prod-19c3cb86-1737740810 --- 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 fa2e35b291..ab873ad5ef 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 2951ed80c9c11edba3a60ff9e27ff2766d4f11c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:48:52 +0300 Subject: [PATCH 30/32] Update calibrate production tags to prod-19c3cb86-1737740810 --- k8s/calibrate/values-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/calibrate/values-prod.yaml b/k8s/calibrate/values-prod.yaml index a5d7c94097..3e9fb8762c 100644 --- a/k8s/calibrate/values-prod.yaml +++ b/k8s/calibrate/values-prod.yaml @@ -6,11 +6,11 @@ app: initContainer: image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file - tag: prod-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 replicaCount: 3 image: repository: eu.gcr.io/airqo-250220/airqo-calibrate-api - tag: prod-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 047845190f382b4afd3b6130754bbb419679abe2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:49:54 +0300 Subject: [PATCH 31/32] Update workflows prod image tag to prod-19c3cb86-1737740810 --- 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 5998efbe49..22fe2bfa1d 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 nameOverride: '' fullnameOverride: '' podAnnotations: {} From f3cc1e863c72788100dd47882991133eda5cf7c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:50:23 +0300 Subject: [PATCH 32/32] Update predict production image tag to prod-19c3cb86-1737740810 --- 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 4e191f6947..e2df5f3954 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-8cdfa8fb-1737733388 + tag: prod-19c3cb86-1737740810 api: name: airqo-prediction-api label: prediction-api