Merge branch 'staging' into update-fix/Clean_up

Updates from airqo staging
airqo-platform · Jan 7, 2025 · e54abfb · e54abfb
2 parents ec8498c + 676af0c
commit e54abfb
Show file tree

Hide file tree

Showing 65 changed files with 7,491 additions and 1,297 deletions.
diff --git a/contributing.md b/contributing.md
@@ -27,6 +27,8 @@ To get an overview of each microservice, read the respective microservice README
 - [meta-data](/src/meta-data/README.md)
 - [Predict](/src/predict/README.md)
 - [View](/src/view/README.md)
+
+
 Here are some resources to help you get started with open source contributions:
 
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git 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-a9e01103-1734211833
+  tag: stage-5d451842-1736194286
 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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 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-a3fd1cf0-1734679838
+  tag: stage-4ca1c803-1736183154
 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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 nameOverride: ''
 fullnameOverride: ''
diff --git 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-8ec03422-1731102123
+  tag: prod-fbf1a3e5-1735852910
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/incentives/values-stage.yaml b/k8s/incentives/values-stage.yaml
@@ -6,13 +6,12 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-incentives-api
-  tag: stage-96d94ce4-1715349509
+  tag: stage-6ffb3fe6-1735572850
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
 resources:
   limits:
-    cpu: 1000m
     memory: 500Mi
   requests:
     cpu: 100m

diff --git a/k8s/insights/values-prod.yaml b/k8s/insights/values-prod.yaml
@@ -6,7 +6,7 @@ images:
     api: eu.gcr.io/airqo-250220/airqo-insights-api
     celery: eu.gcr.io/airqo-250220/airqo-insights-celery
     celeryWorker: eu.gcr.io/airqo-250220/airqo-insights-celery-worker
-  tag: prod-015fde10-1730310056
+  tag: prod-b1c7ea69-1735899837
 api:
   name: airqo-insights-api
   label: insights-api

diff --git a/k8s/insights/values-stage.yaml b/k8s/insights/values-stage.yaml
@@ -5,7 +5,7 @@ images:
   repositories:
     api: eu.gcr.io/airqo-250220/airqo-stage-insights-api
     celery: eu.gcr.io/airqo-250220/airqo-stage-insights-celery
-  tag: stage-38af6de7-1730309744
+  tag: stage-6ffb3fe6-1735572850
 api:
   name: airqo-stage-insights-api
   label: sta-alytics-api
@@ -14,7 +14,6 @@ api:
   podAnnotations: {}
   resources:
     limits:
-      cpu: 100m
       memory: 600Mi
     requests:
       cpu: 10m

diff --git a/k8s/kafka/topics/kafka-topics.yaml b/k8s/kafka/topics/kafka-topics.yaml
@@ -307,3 +307,17 @@ spec:
   replicas: 2
   config:
     retention.ms: 18000000
+
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: airqo.forecasts
+  namespace: message-broker
+  labels:
+    strimzi.io/cluster: kafka-cluster
+spec:
+  partitions: 2
+  replicas: 2
+  config:
+    retention.ms: 18000000
diff --git a/k8s/meta-data/values-prod.yaml b/k8s/meta-data/values-prod.yaml
@@ -8,7 +8,7 @@ images:
   repositories:
     api: eu.gcr.io/airqo-250220/airqo-meta-data-api
     sitesConsumer: eu.gcr.io/airqo-250220/airqo-meta-data-sites-consumer
-  tag: prod-5244fe67-1730977223
+  tag: prod-6d2ca253-1736194337
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/meta-data/values-stage.yaml b/k8s/meta-data/values-stage.yaml
@@ -8,13 +8,12 @@ images:
   repositories:
     api: eu.gcr.io/airqo-250220/airqo-stage-meta-data-api
     sitesConsumer: eu.gcr.io/airqo-250220/airqo-stage-meta-data-sites-consumer
-  tag: stage-38af6de7-1730309744
+  tag: stage-6ffb3fe6-1735572850
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
 resources:
   limits:
-    cpu: 400m
     memory: 700Mi
   requests:
     cpu: 50m

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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/predict/values-stage.yaml b/k8s/predict/values-stage.yaml
@@ -16,7 +16,6 @@ api:
   podAnnotations: {}
   resources:
     limits:
-      cpu: 50m
       memory: 200Mi
     requests:
       cpu: 5m

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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/spatial/values-stage.yaml b/k8s/spatial/values-stage.yaml
@@ -6,13 +6,12 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-spatial-api
-  tag: stage-1595bb07-1734517712
+  tag: stage-6ffb3fe6-1735572850
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
 resources:
   limits:
-    cpu: 100m
     memory: 400Mi
   requests:
     cpu: 10m

diff --git a/k8s/view/values-prod.yaml b/k8s/view/values-prod.yaml
@@ -5,7 +5,7 @@ images:
   repositories:
     api: eu.gcr.io/airqo-250220/airqo-view-api
     messageBroker: eu.gcr.io/airqo-250220/airqo-view-message-broker
-  tag: prod-1f061bdf-1731360102
+  tag: prod-c1d1fce6-1735895602
 api:
   name: airqo-view-api
   label: view-api

diff --git a/k8s/view/values-stage.yaml b/k8s/view/values-stage.yaml
@@ -13,7 +13,6 @@ api:
   podAnnotations: {}
   resources:
     limits:
-      cpu: 100m
       memory: 1000Mi
     requests:
       cpu: 5m

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-ce82c1ac-1734679890
+  tag: prod-c1d1fce6-1735895602
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/website/values-stage.yaml b/k8s/website/values-stage.yaml
@@ -6,13 +6,12 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-website-api
-  tag: stage-7a1d5dd3-1733836788
+  tag: stage-6ffb3fe6-1735572850
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
 resources:
   limits:
-    cpu: 100m
     memory: 400Mi
   requests:
     cpu: 10m

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-ce82c1ac-1734679890
+  tag: prod-6d2ca253-1736194337
 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-e05bdc71-1734549206
+  tag: stage-6ffb3fe6-1735572850
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
@@ -20,28 +20,24 @@ resources:
       cpu: 125m
       memory: 500Mi
     limits:
-      cpu: 1000m
       memory: 1500Mi
   scheduler:
     requests:
       cpu: 125m
       memory: 500Mi
     limits:
-      cpu: 2000m
       memory: 2000Mi
   celery:
     requests:
       cpu: 125m
       memory: 500Mi
     limits:
-      cpu: 2000m
       memory: 2000Mi
   redis:
     requests:
       cpu: 50m
       memory: 125Mi
     limits:
-      cpu: 1000m
       memory: 2000Mi
 volumeMounts:
   - name: config-volume