From 821d0445e7da73c0fdfb975b043f7821becce80c Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 2 Sep 2026 13:10:38 +0000 Subject: [PATCH 1/3] [CD] Release Request Consumables 1.3.0 --- .../ra/request-consumables/overlays/prod/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ra/request-consumables/overlays/prod/deployment.yaml b/components/ra/request-consumables/overlays/prod/deployment.yaml index 397c3c78..557f8d72 100644 --- a/components/ra/request-consumables/overlays/prod/deployment.yaml +++ b/components/ra/request-consumables/overlays/prod/deployment.yaml @@ -7,7 +7,7 @@ spec: spec: containers: - name: request-consumables - image: ghcr.io/isisbusapps/request-consumables:1.2.0 + image: ghcr.io/isisbusapps/request-consumables@sha256:448525de50ed3bc0029fca1ce7a7f06ef29fcdf066f1b3296e59c2acf01c64bc env: - name: NODE_ENV value: production @@ -21,4 +21,4 @@ spec: name: common-pug-views - name: common-js configMap: - name: common-pug-content-js \ No newline at end of file + name: common-pug-content-js From 87ed0c866d3bfffa5aa7045223a36d472e7ed73a Mon Sep 17 00:00:00 2001 From: Alex Lay Date: Wed, 2 Sep 2026 14:43:46 +0100 Subject: [PATCH 2/3] Update prod request-consumables config to match dev Consolidates the now shared config into base. The only change to the generated dev yaml is volume ordering. --- .../ra/request-consumables/base/deployment.yaml | 12 ++++++++++++ .../overlays/dev/deployment.yaml | 14 -------------- .../overlays/dev/kustomization.yaml | 2 +- .../overlays/prod/deployment.yaml | 11 ----------- .../overlays/prod/kustomization.yaml | 1 + .../overlays/prod/static-secret.yaml | 16 ++++++++++++++++ 6 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 components/ra/request-consumables/overlays/prod/static-secret.yaml diff --git a/components/ra/request-consumables/base/deployment.yaml b/components/ra/request-consumables/base/deployment.yaml index 568ac62a..77fd8b0e 100644 --- a/components/ra/request-consumables/base/deployment.yaml +++ b/components/ra/request-consumables/base/deployment.yaml @@ -27,6 +27,9 @@ spec: env: - name: CONFIG_PATH value: /FBS/.env + envFrom: + - secretRef: + name: request-consumables volumeMounts: - name: env-config mountPath: "/FBS" @@ -34,6 +37,9 @@ spec: - name: common-views mountPath: "/app/build/common-views" readOnly: true + - name: common-public + mountPath: "/app/build/common-public" + readOnly: true readinessProbe: httpGet: path: /consumables/health/ready @@ -46,3 +52,9 @@ spec: - name: env-config secret: secretName: request-consumables-environment + - name: common-views + configMap: + name: common-pug-views-2026 + - name: common-public + configMap: + name: common-pug-public-2026 diff --git a/components/ra/request-consumables/overlays/dev/deployment.yaml b/components/ra/request-consumables/overlays/dev/deployment.yaml index d3380ac2..c528823d 100644 --- a/components/ra/request-consumables/overlays/dev/deployment.yaml +++ b/components/ra/request-consumables/overlays/dev/deployment.yaml @@ -11,17 +11,3 @@ spec: env: - name: NODE_ENV value: development - envFrom: - - secretRef: - name: request-consumables - volumeMounts: - - name: common-public - mountPath: "/app/build/common-public" - readOnly: true - volumes: - - name: common-views - configMap: - name: common-pug-views-2026 - - name: common-public - configMap: - name: common-pug-public-2026 \ No newline at end of file diff --git a/components/ra/request-consumables/overlays/dev/kustomization.yaml b/components/ra/request-consumables/overlays/dev/kustomization.yaml index 6365c013..638c8b6d 100644 --- a/components/ra/request-consumables/overlays/dev/kustomization.yaml +++ b/components/ra/request-consumables/overlays/dev/kustomization.yaml @@ -8,4 +8,4 @@ resources: namespace: apps patches: - - path: deployment.yaml \ No newline at end of file + - path: deployment.yaml diff --git a/components/ra/request-consumables/overlays/prod/deployment.yaml b/components/ra/request-consumables/overlays/prod/deployment.yaml index 557f8d72..8f341d55 100644 --- a/components/ra/request-consumables/overlays/prod/deployment.yaml +++ b/components/ra/request-consumables/overlays/prod/deployment.yaml @@ -11,14 +11,3 @@ spec: env: - name: NODE_ENV value: production - volumeMounts: - - name: common-js - mountPath: "/app/build/common-public/js" - readOnly: true - volumes: - - name: common-views - configMap: - name: common-pug-views - - name: common-js - configMap: - name: common-pug-content-js diff --git a/components/ra/request-consumables/overlays/prod/kustomization.yaml b/components/ra/request-consumables/overlays/prod/kustomization.yaml index 433e34ab..638c8b6d 100644 --- a/components/ra/request-consumables/overlays/prod/kustomization.yaml +++ b/components/ra/request-consumables/overlays/prod/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization resources: - ../../base + - static-secret.yaml namespace: apps diff --git a/components/ra/request-consumables/overlays/prod/static-secret.yaml b/components/ra/request-consumables/overlays/prod/static-secret.yaml new file mode 100644 index 00000000..47666d1e --- /dev/null +++ b/components/ra/request-consumables/overlays/prod/static-secret.yaml @@ -0,0 +1,16 @@ +apiVersion: secrets.hashicorp.com/v1beta1 +kind: VaultStaticSecret +metadata: + name: request-consumables + namespace: apps +spec: + type: kv-v2 + refreshAfter: 30s + vaultAuthRef: static-auth + + mount: reviews_and_allocations + path: prod/request-consumables + destination: + name: request-consumables + overwrite: true + create: true From a7a23f7b1c0177f7b5a54f6f2dd94460116b1722 Mon Sep 17 00:00:00 2001 From: Alex Lay Date: Wed, 2 Sep 2026 16:45:10 +0100 Subject: [PATCH 3/3] Replace request-consumables hash with image tag --- components/ra/request-consumables/overlays/prod/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ra/request-consumables/overlays/prod/deployment.yaml b/components/ra/request-consumables/overlays/prod/deployment.yaml index 8f341d55..23dd4324 100644 --- a/components/ra/request-consumables/overlays/prod/deployment.yaml +++ b/components/ra/request-consumables/overlays/prod/deployment.yaml @@ -7,7 +7,7 @@ spec: spec: containers: - name: request-consumables - image: ghcr.io/isisbusapps/request-consumables@sha256:448525de50ed3bc0029fca1ce7a7f06ef29fcdf066f1b3296e59c2acf01c64bc + image: ghcr.io/isisbusapps/request-consumables:1.3.0 env: - name: NODE_ENV value: production