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 397c3c78..23dd4324 100644 --- a/components/ra/request-consumables/overlays/prod/deployment.yaml +++ b/components/ra/request-consumables/overlays/prod/deployment.yaml @@ -7,18 +7,7 @@ spec: spec: containers: - name: request-consumables - image: ghcr.io/isisbusapps/request-consumables:1.2.0 + image: ghcr.io/isisbusapps/request-consumables:1.3.0 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 \ No newline at end of file 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