From faada90e1be64f74e819f89c32553a3e259d51a2 Mon Sep 17 00:00:00 2001 From: Daniel Hatton Date: Fri, 19 Jun 2026 09:47:04 +0100 Subject: [PATCH 1/2] fetch more postgres and rmq related environment variables from secret in k8s deployments of the HTTP API --- .../development/smartem-http-api.yaml | 25 +++++++++++++++++++ .../production/smartem-http-api.yaml | 25 +++++++++++++++++++ .../staging/smartem-http-api.yaml | 25 +++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/k8s/environments/development/smartem-http-api.yaml b/k8s/environments/development/smartem-http-api.yaml index 382c644..f2e9f90 100644 --- a/k8s/environments/development/smartem-http-api.yaml +++ b/k8s/environments/development/smartem-http-api.yaml @@ -38,6 +38,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -48,6 +63,16 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config diff --git a/k8s/environments/production/smartem-http-api.yaml b/k8s/environments/production/smartem-http-api.yaml index fbde39e..b29f28d 100644 --- a/k8s/environments/production/smartem-http-api.yaml +++ b/k8s/environments/production/smartem-http-api.yaml @@ -36,6 +36,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -46,6 +61,16 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config diff --git a/k8s/environments/staging/smartem-http-api.yaml b/k8s/environments/staging/smartem-http-api.yaml index 19868d3..6cf872e 100644 --- a/k8s/environments/staging/smartem-http-api.yaml +++ b/k8s/environments/staging/smartem-http-api.yaml @@ -35,6 +35,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -45,6 +60,16 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config From 2b6007f5f00882c321b6513293603bdbcc6b1a0a Mon Sep 17 00:00:00 2001 From: Daniel Hatton Date: Tue, 23 Jun 2026 09:26:48 +0100 Subject: [PATCH 2/2] the worker also needs more postgres/rmq env variables --- .../development/smartem-http-api.yaml | 5 ++++ .../development/smartem-worker.yaml | 30 +++++++++++++++++++ .../production/smartem-http-api.yaml | 5 ++++ .../production/smartem-worker.yaml | 30 +++++++++++++++++++ .../staging/smartem-http-api.yaml | 5 ++++ k8s/environments/staging/smartem-worker.yaml | 30 +++++++++++++++++++ 6 files changed, 105 insertions(+) diff --git a/k8s/environments/development/smartem-http-api.yaml b/k8s/environments/development/smartem-http-api.yaml index f2e9f90..7c4198c 100644 --- a/k8s/environments/development/smartem-http-api.yaml +++ b/k8s/environments/development/smartem-http-api.yaml @@ -68,6 +68,11 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT - name: RABBITMQ_EXCHANGE valueFrom: secretKeyRef: diff --git a/k8s/environments/development/smartem-worker.yaml b/k8s/environments/development/smartem-worker.yaml index 80b2d9f..c207496 100644 --- a/k8s/environments/development/smartem-worker.yaml +++ b/k8s/environments/development/smartem-worker.yaml @@ -36,6 +36,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -46,6 +61,21 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config diff --git a/k8s/environments/production/smartem-http-api.yaml b/k8s/environments/production/smartem-http-api.yaml index b29f28d..255deb4 100644 --- a/k8s/environments/production/smartem-http-api.yaml +++ b/k8s/environments/production/smartem-http-api.yaml @@ -66,6 +66,11 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT - name: RABBITMQ_EXCHANGE valueFrom: secretKeyRef: diff --git a/k8s/environments/production/smartem-worker.yaml b/k8s/environments/production/smartem-worker.yaml index af7a79d..3bb821a 100644 --- a/k8s/environments/production/smartem-worker.yaml +++ b/k8s/environments/production/smartem-worker.yaml @@ -34,6 +34,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -44,6 +59,21 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config diff --git a/k8s/environments/staging/smartem-http-api.yaml b/k8s/environments/staging/smartem-http-api.yaml index 6cf872e..2baf9e9 100644 --- a/k8s/environments/staging/smartem-http-api.yaml +++ b/k8s/environments/staging/smartem-http-api.yaml @@ -65,6 +65,11 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT - name: RABBITMQ_EXCHANGE valueFrom: secretKeyRef: diff --git a/k8s/environments/staging/smartem-worker.yaml b/k8s/environments/staging/smartem-worker.yaml index 1442c73..1bce675 100644 --- a/k8s/environments/staging/smartem-worker.yaml +++ b/k8s/environments/staging/smartem-worker.yaml @@ -33,6 +33,21 @@ spec: secretKeyRef: name: smartem-secrets key: POSTGRES_PASSWORD + - name: POSTGRES_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_HOST + - name: POSTGRES_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_PORT + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: smartem-secrets + key: POSTGRES_DB - name: RABBITMQ_USER valueFrom: secretKeyRef: @@ -43,6 +58,21 @@ spec: secretKeyRef: name: smartem-secrets key: RABBITMQ_PASSWORD + - name: RABBITMQ_HOST + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_HOST + - name: RABBITMQ_PORT + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_PORT + - name: RABBITMQ_EXCHANGE + valueFrom: + secretKeyRef: + name: smartem-secrets + key: RABBITMQ_EXCHANGE envFrom: - configMapRef: name: smartem-config