From 5b6c13b087d703bdef43ce881de864348cf38088 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:52:03 +0300 Subject: [PATCH 1/9] Update website staging image tag to stage-db11491e-1732546250 --- k8s/website/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/website/values-stage.yaml b/k8s/website/values-stage.yaml index 7ac3b953ac..07c3d24220 100644 --- a/k8s/website/values-stage.yaml +++ b/k8s/website/values-stage.yaml @@ -6,7 +6,7 @@ app: replicaCount: 2 image: repository: eu.gcr.io/airqo-250220/airqo-stage-website-api - tag: stage-33e734c1-1732536251 + tag: stage-db11491e-1732546250 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 7d4a3a1a73d932f5926393238933f42d252f4a15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:52:25 +0300 Subject: [PATCH 2/9] Update AirQo exceedance production image tag to prod-6fe30608-1732546291 --- 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 d531ad2b38..09d2361f22 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 nameOverride: '' fullnameOverride: '' From b2d8c1cc8bb1ec9c3443422810da7658a4ea77f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:52:32 +0300 Subject: [PATCH 3/9] Update KCCA exceedance production image tag to prod-6fe30608-1732546291 --- 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 f5e3f446db..db33018727 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 nameOverride: '' fullnameOverride: '' From 6bc71b91c2ceeaa8ff9f236255565a92cb577db2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:53:09 +0300 Subject: [PATCH 4/9] Update auth service production image tag to prod-6fe30608-1732546291 --- 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 24c31d4824..8ab8a43a1a 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 40dae087dcf4a956393c37159e0544f093032404 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:53:21 +0300 Subject: [PATCH 5/9] Update device registry production image tag to prod-6fe30608-1732546291 --- 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 96c428471a..2fc8ab7805 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 nameOverride: '' fullnameOverride: '' podAnnotations: {} From 58d11d0d5bc6b0bf90b809300e160e5390e373bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:54:37 +0300 Subject: [PATCH 6/9] Update analytics production image tag to prod-6fe30608-1732546291 --- 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 68e719d580..bf6c39d2ef 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 api: name: airqo-analytics-api label: analytics-api From 728eb1ee91c478e05bbe1bc28b2a1c51e64ca9b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:55:41 +0300 Subject: [PATCH 7/9] Update predict production image tag to prod-6fe30608-1732546291 --- 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 83f0ff65fa..ef5b1458a9 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-8e64a1e8-1732536341 + tag: prod-6fe30608-1732546291 api: name: airqo-prediction-api label: prediction-api From 751311ab365343eabaa09b348392f0c3d4c9185b Mon Sep 17 00:00:00 2001 From: Ochieng Paul Date: Mon, 25 Nov 2024 18:33:21 +0300 Subject: [PATCH 8/9] update --- src/website/core/settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/website/core/settings.py b/src/website/core/settings.py index 4da19b0ef6..847dfec76c 100644 --- a/src/website/core/settings.py +++ b/src/website/core/settings.py @@ -88,8 +88,11 @@ def parse_env_list(env_var, default=""): CORS_ORIGIN_REGEX_WHITELIST = parse_env_list("CORS_ORIGIN_REGEX_WHITELIST") CSRF_TRUSTED_ORIGINS = parse_env_list("CSRF_TRUSTED_ORIGINS") +print(f"CSRF_TRUSTED_ORIGINS: {CSRF_TRUSTED_ORIGINS}") + # Only allow CSRF cookie over HTTPS in production -CSRF_COOKIE_SECURE = not DEBUG +CSRF_COOKIE_SECURE = True +SESSION_COOKIE_SECURE = True # Root URL configuration ROOT_URLCONF = 'core.urls' From 4428a643e3010ac199217067e5b41d64e4f23700 Mon Sep 17 00:00:00 2001 From: Ochieng Paul Date: Mon, 25 Nov 2024 18:40:11 +0300 Subject: [PATCH 9/9] REMOVED PRINT --- src/website/core/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/website/core/settings.py b/src/website/core/settings.py index 847dfec76c..3381f0ce27 100644 --- a/src/website/core/settings.py +++ b/src/website/core/settings.py @@ -88,7 +88,6 @@ def parse_env_list(env_var, default=""): CORS_ORIGIN_REGEX_WHITELIST = parse_env_list("CORS_ORIGIN_REGEX_WHITELIST") CSRF_TRUSTED_ORIGINS = parse_env_list("CSRF_TRUSTED_ORIGINS") -print(f"CSRF_TRUSTED_ORIGINS: {CSRF_TRUSTED_ORIGINS}") # Only allow CSRF cookie over HTTPS in production CSRF_COOKIE_SECURE = True