Skip to content

Commit

Permalink
Merge branch 'staging' into refactor-caching
Browse files Browse the repository at this point in the history
  • Loading branch information
Baalmart committed Nov 20, 2024
2 parents a89beef + dbb9e85 commit 317af8c
Show file tree
Hide file tree
Showing 18 changed files with 620 additions and 258 deletions.
6 changes: 3 additions & 3 deletions k8s/analytics/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-24272a02-1731937745
tag: prod-9ef437cc-1732110711
api:
name: airqo-analytics-api
label: analytics-api
Expand All @@ -17,8 +17,8 @@ api:
podAnnotations: {}
resources:
limits:
cpu: 100m
memory: 600Mi
cpu: 1000m
memory: 2000Mi
requests:
cpu: 10m
memory: 250Mi
Expand Down
6 changes: 3 additions & 3 deletions k8s/analytics/values-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
celeryWorker: eu.gcr.io/airqo-250220/airqo-stage-analytics-celery-worker
reportJob: eu.gcr.io/airqo-250220/airqo-stage-analytics-report-job
devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-stage-analytics-devices-summary-job
tag: stage-5ba65cfa-1731092285
tag: stage-ddf20bb7-1732102979
api:
name: airqo-stage-analytics-api
label: sta-alytics-api
Expand All @@ -17,8 +17,8 @@ api:
podAnnotations: {}
resources:
limits:
cpu: 100m
memory: 600Mi
cpu: 500m
memory: 1000Mi
requests:
cpu: 10m
memory: 250Mi
Expand Down
2 changes: 1 addition & 1 deletion k8s/auth-service/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-auth-api
tag: prod-24272a02-1731937745
tag: prod-9ef437cc-1732110711
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
4 changes: 2 additions & 2 deletions k8s/calibrate/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ app:
initContainer:
image:
repository: eu.gcr.io/airqo-250220/airqo-calibrate-pickle-file
tag: prod-24272a02-1731937745
tag: prod-8aa5ca9a-1732095343
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-calibrate-api
tag: prod-24272a02-1731937745
tag: prod-8aa5ca9a-1732095343
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/device-registry/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
tag: prod-24272a02-1731937745
tag: prod-9ef437cc-1732110711
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/device-registry/values-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 2
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
tag: stage-4292371f-1731851989
tag: stage-09945614-1732110667
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-airqo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
tag: prod-24272a02-1731937745
tag: prod-9ef437cc-1732110711
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-kcca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
tag: prod-24272a02-1731937745
tag: prod-9ef437cc-1732110711
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/locate/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-locate-api
tag: prod-24272a02-1731937745
tag: prod-9ef437cc-1732110711
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/predict/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-24272a02-1731937745
tag: prod-9ef437cc-1732110711
api:
name: airqo-prediction-api
label: prediction-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/website/values-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 2
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-website-api
tag: stage-3fbb8b49-1731943981
tag: stage-18f9b58d-1731945154
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
Loading

0 comments on commit 317af8c

Please sign in to comment.