From 16f8b124acbce7cea1c5ff5686589ece3a0eb60d Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 13:24:31 +0100 Subject: [PATCH 1/7] Fix dev deployment yaml --- components/ra/user-claims-backend/overlays/dev/deployment.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/ra/user-claims-backend/overlays/dev/deployment.yaml b/components/ra/user-claims-backend/overlays/dev/deployment.yaml index 9f77d888..0c98fd7d 100644 --- a/components/ra/user-claims-backend/overlays/dev/deployment.yaml +++ b/components/ra/user-claims-backend/overlays/dev/deployment.yaml @@ -8,7 +8,4 @@ spec: containers: - name: user-claims-backend image: ghcr.io/isisbusapps/user-claims-backend@sha256:5ee97cbbf2a4cd76f45259be016a54b5cee1e637c4ace9023397a51bc073a853 - envFrom: - - secretRef: - name: approved-experiments \ No newline at end of file From 58f2b07e29a227d86051b19a33ad665f6519491b Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 13:24:49 +0100 Subject: [PATCH 2/7] Add backend app yaml --- argocd/prod/ra/user-claims-backend/app.yaml | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 argocd/prod/ra/user-claims-backend/app.yaml diff --git a/argocd/prod/ra/user-claims-backend/app.yaml b/argocd/prod/ra/user-claims-backend/app.yaml new file mode 100644 index 00000000..c8cb1160 --- /dev/null +++ b/argocd/prod/ra/user-claims-backend/app.yaml @@ -0,0 +1,32 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: user-claims-backend + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - clusters: + selector: + matchLabels: + appEnvironment: prod + template: + metadata: + name: '{{.name}}-user-claims-backend' + spec: + project: r-a-project + source: + path: components/ra/user-claims-backend/overlays/prod + repoURL: 'https://github.com/isisbusapps/gitops' + targetRevision: main + destination: + namespace: apps + name: '{{.name}}' + ignoreDifferences: + - group: apps + kind: Deployment + jqPathExpressions: + - .spec.template.spec.containers[0].image + syncPolicy: + automated: {} \ No newline at end of file From e58031340e680db6f7c175f8ce6b2b278ba553bd Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 13:25:05 +0100 Subject: [PATCH 3/7] Add backend prod overlays --- .../overlays/prod/deployment.yml | 10 ++++++++++ .../overlays/prod/kustomization.yml | 11 +++++++++++ .../overlays/prod/static-secret.yaml | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 components/ra/user-claims-backend/overlays/prod/deployment.yml create mode 100644 components/ra/user-claims-backend/overlays/prod/kustomization.yml create mode 100644 components/ra/user-claims-backend/overlays/prod/static-secret.yaml diff --git a/components/ra/user-claims-backend/overlays/prod/deployment.yml b/components/ra/user-claims-backend/overlays/prod/deployment.yml new file mode 100644 index 00000000..24395932 --- /dev/null +++ b/components/ra/user-claims-backend/overlays/prod/deployment.yml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: user-claims-backend +spec: + template: + spec: + containers: + - name: user-claims-backend + image: ghcr.io/isisbusapps/user-claims-backend:2.1.0 diff --git a/components/ra/user-claims-backend/overlays/prod/kustomization.yml b/components/ra/user-claims-backend/overlays/prod/kustomization.yml new file mode 100644 index 00000000..01fbe4dc --- /dev/null +++ b/components/ra/user-claims-backend/overlays/prod/kustomization.yml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: + - ../../base + - static-secret.yaml + +namespace: apps + +patches: + - path: deployment.yml diff --git a/components/ra/user-claims-backend/overlays/prod/static-secret.yaml b/components/ra/user-claims-backend/overlays/prod/static-secret.yaml new file mode 100644 index 00000000..33cb4f1c --- /dev/null +++ b/components/ra/user-claims-backend/overlays/prod/static-secret.yaml @@ -0,0 +1,16 @@ +apiVersion: secrets.hashicorp.com/v1beta1 +kind: VaultStaticSecret +metadata: + name: user-claims-backend + namespace: apps +spec: + type: kv-v2 + refreshAfter: 30s + vaultAuthRef: static-auth + + mount: reviews_and_allocations + path: prod/user-claims-backend + destination: + name: user-claims-backend + overwrite: true + create: true \ No newline at end of file From 1a0b694ca5c3c824133345da67a1499e404a9299 Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 13:27:16 +0100 Subject: [PATCH 4/7] Add frontend yaml --- argocd/prod/ra/user-claims-frontend/app.yaml | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 argocd/prod/ra/user-claims-frontend/app.yaml diff --git a/argocd/prod/ra/user-claims-frontend/app.yaml b/argocd/prod/ra/user-claims-frontend/app.yaml new file mode 100644 index 00000000..b5676257 --- /dev/null +++ b/argocd/prod/ra/user-claims-frontend/app.yaml @@ -0,0 +1,32 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: user-claims-frontend + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - clusters: + selector: + matchLabels: + appEnvironment: prod + template: + metadata: + name: '{{.name}}-user-claims-frontend' + spec: + project: r-a-project + source: + path: components/ra/user-claims-frontend/overlays/prod + repoURL: 'https://github.com/isisbusapps/gitops' + targetRevision: main + destination: + namespace: apps + name: '{{.name}}' + ignoreDifferences: + - group: apps + kind: Deployment + jqPathExpressions: + - .spec.template.spec.containers[0].image + syncPolicy: + automated: {} \ No newline at end of file From 7a3a5603a7985373f9e099a02fb6d2362f4a1658 Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 13:27:26 +0100 Subject: [PATCH 5/7] Add frontend overlays --- .../user-claims-frontend/overlays/prod/deployment.yml | 10 ++++++++++ .../overlays/prod/kustomization.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 components/ra/user-claims-frontend/overlays/prod/deployment.yml create mode 100644 components/ra/user-claims-frontend/overlays/prod/kustomization.yml diff --git a/components/ra/user-claims-frontend/overlays/prod/deployment.yml b/components/ra/user-claims-frontend/overlays/prod/deployment.yml new file mode 100644 index 00000000..24395932 --- /dev/null +++ b/components/ra/user-claims-frontend/overlays/prod/deployment.yml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: user-claims-backend +spec: + template: + spec: + containers: + - name: user-claims-backend + image: ghcr.io/isisbusapps/user-claims-backend:2.1.0 diff --git a/components/ra/user-claims-frontend/overlays/prod/kustomization.yml b/components/ra/user-claims-frontend/overlays/prod/kustomization.yml new file mode 100644 index 00000000..d7a9a2b1 --- /dev/null +++ b/components/ra/user-claims-frontend/overlays/prod/kustomization.yml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: + - ../../base + +namespace: apps + +patches: + - path: deployment.yml From 68aff3cd5858cd843a2d41ab821656cfc2d05cbc Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 14:22:56 +0100 Subject: [PATCH 6/7] change .yml to .yaml --- .../overlays/prod/{deployment.yml => deployment.yaml} | 0 .../overlays/prod/{kustomization.yml => kustomization.yaml} | 0 .../overlays/prod/{deployment.yml => deployment.yaml} | 0 .../overlays/prod/{kustomization.yml => kustomization.yaml} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename components/ra/user-claims-backend/overlays/prod/{deployment.yml => deployment.yaml} (100%) rename components/ra/user-claims-backend/overlays/prod/{kustomization.yml => kustomization.yaml} (100%) rename components/ra/user-claims-frontend/overlays/prod/{deployment.yml => deployment.yaml} (100%) rename components/ra/user-claims-frontend/overlays/prod/{kustomization.yml => kustomization.yaml} (100%) diff --git a/components/ra/user-claims-backend/overlays/prod/deployment.yml b/components/ra/user-claims-backend/overlays/prod/deployment.yaml similarity index 100% rename from components/ra/user-claims-backend/overlays/prod/deployment.yml rename to components/ra/user-claims-backend/overlays/prod/deployment.yaml diff --git a/components/ra/user-claims-backend/overlays/prod/kustomization.yml b/components/ra/user-claims-backend/overlays/prod/kustomization.yaml similarity index 100% rename from components/ra/user-claims-backend/overlays/prod/kustomization.yml rename to components/ra/user-claims-backend/overlays/prod/kustomization.yaml diff --git a/components/ra/user-claims-frontend/overlays/prod/deployment.yml b/components/ra/user-claims-frontend/overlays/prod/deployment.yaml similarity index 100% rename from components/ra/user-claims-frontend/overlays/prod/deployment.yml rename to components/ra/user-claims-frontend/overlays/prod/deployment.yaml diff --git a/components/ra/user-claims-frontend/overlays/prod/kustomization.yml b/components/ra/user-claims-frontend/overlays/prod/kustomization.yaml similarity index 100% rename from components/ra/user-claims-frontend/overlays/prod/kustomization.yml rename to components/ra/user-claims-frontend/overlays/prod/kustomization.yaml From 747a358d810d164c0a9b41db5da336654c096b57 Mon Sep 17 00:00:00 2001 From: William-Edwards-STFC Date: Wed, 12 Aug 2026 15:57:49 +0100 Subject: [PATCH 7/7] Update kustomize files --- components/ra/user-claims-backend/base/kustomization.yaml | 8 ++++---- .../user-claims-backend/overlays/dev/kustomization.yaml | 2 +- .../user-claims-backend/overlays/prod/kustomization.yaml | 2 +- .../ra/user-claims-frontend/base/kustomization.yaml | 6 +++--- .../user-claims-frontend/overlays/dev/kustomization.yaml | 2 +- .../user-claims-frontend/overlays/prod/kustomization.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/ra/user-claims-backend/base/kustomization.yaml b/components/ra/user-claims-backend/base/kustomization.yaml index 8c9a1278..1a627913 100644 --- a/components/ra/user-claims-backend/base/kustomization.yaml +++ b/components/ra/user-claims-backend/base/kustomization.yaml @@ -7,7 +7,7 @@ commonLabels: namespace: apps resources: - - deployment.yml - - service.yml - - httproute.yml - - static-secret.yml + - deployment.yaml + - service.yaml + - httproute.yaml + - static-secret.yaml diff --git a/components/ra/user-claims-backend/overlays/dev/kustomization.yaml b/components/ra/user-claims-backend/overlays/dev/kustomization.yaml index 2c07286f..b62a6bc6 100644 --- a/components/ra/user-claims-backend/overlays/dev/kustomization.yaml +++ b/components/ra/user-claims-backend/overlays/dev/kustomization.yaml @@ -8,5 +8,5 @@ bases: namespace: apps patches: - - path: deployment.yml + - path: deployment.yaml \ No newline at end of file diff --git a/components/ra/user-claims-backend/overlays/prod/kustomization.yaml b/components/ra/user-claims-backend/overlays/prod/kustomization.yaml index 01fbe4dc..4856d542 100644 --- a/components/ra/user-claims-backend/overlays/prod/kustomization.yaml +++ b/components/ra/user-claims-backend/overlays/prod/kustomization.yaml @@ -8,4 +8,4 @@ bases: namespace: apps patches: - - path: deployment.yml + - path: deployment.yaml diff --git a/components/ra/user-claims-frontend/base/kustomization.yaml b/components/ra/user-claims-frontend/base/kustomization.yaml index 6cf629d9..ba4db0c8 100644 --- a/components/ra/user-claims-frontend/base/kustomization.yaml +++ b/components/ra/user-claims-frontend/base/kustomization.yaml @@ -7,6 +7,6 @@ commonLabels: namespace: apps resources: - - deployment.yml - - service.yml - - httproute.yml + - deployment.yaml + - service.yaml + - httproute.yaml diff --git a/components/ra/user-claims-frontend/overlays/dev/kustomization.yaml b/components/ra/user-claims-frontend/overlays/dev/kustomization.yaml index 6dbbd4d3..0d963410 100644 --- a/components/ra/user-claims-frontend/overlays/dev/kustomization.yaml +++ b/components/ra/user-claims-frontend/overlays/dev/kustomization.yaml @@ -7,5 +7,5 @@ bases: namespace: apps patches: - - path: deployment.yml + - path: deployment.yaml \ No newline at end of file diff --git a/components/ra/user-claims-frontend/overlays/prod/kustomization.yaml b/components/ra/user-claims-frontend/overlays/prod/kustomization.yaml index d7a9a2b1..cf99270b 100644 --- a/components/ra/user-claims-frontend/overlays/prod/kustomization.yaml +++ b/components/ra/user-claims-frontend/overlays/prod/kustomization.yaml @@ -7,4 +7,4 @@ bases: namespace: apps patches: - - path: deployment.yml + - path: deployment.yaml