Add Argo CD and Helm configuration for UOP and FAP Results Letter topology resources by Bhaswati1148 · Pull Request #330 · isisbusapps/gitops

Bhaswati1148 · 2026-06-15T16:28:20Z

Closes https://github.com/isisbusapps/docker-orchestration/issues/857

This PR adds the Argo CD configuration and Helm chart changes required to deploy the UOP and FAP Results Letter RabbitMQ topology resources. The changes include Helm values, chart configuration, and templates for managing the topology resources.
This PR also adds httpRoute for the rabbitmq cluster operator instance.

…-uop-specific-rabbitmq-definitions

…uster operator instance

Sahil-STFC · 2026-06-25T09:41:45Z

+             - values.yaml
+        # Kustomize config for ingress
+        - path: components/shared/message-broker/overlays/dev
+          repoURL: 'https://github.com/isisbusapps/gitops'


Sahil-STFC · 2026-06-25T09:43:10Z

+            valueFiles:
+             - values.yaml
+        # Kustomize config for ingress
+        - path: components/shared/message-broker/overlays/dev


why are we adding Kustomize files , we already have helm chart

The kustomize files are for including the HTTPRoute configuration of the rabbitmq cluster operator instance.
The HTTPRoute is configured in dev and can be accessed using https://devkubernetes.developers.facilities.rl.ac.uk/rmq/#/queues

Instead of kustomize can you use helm ?
whats happening here is that half of the implementation is in helm and other half in kustomize

Sahil-STFC · 2026-06-25T09:48:07Z

Why is this file needed ?

R&A team needs to access the management UI to check the queues and exchanges. I mentioned about this in one of our meetings with your team.
The HTTPRoute is required to expose the RabbitMQ Management UI through the Gateway API.
The HTTPRoute configuration is applied using kustomize, so it has been added to argocd configuration files. This has noting to do with rabbitmq cluster operator instance which is deployed using helm values.
@Sahil-STFC

we have exposed Publisher using HTTPRoute and Helm , I think you can do the same thing for the exchange?

rabbitmq cluster operator and message broker both are deployed using helm.

I could find this HTTPRoute and kustomize configuration for Publisher, is this the one you are referring above ?
I don't find helm being used to expose publisher, unless I am looking at wrong place.
@Sahil-STFC

Sorry my bad, Publisher is kustomize and HTTPRoutes, I don't remember why its that way, we might have to change it in the future.
As of now I think if you'll put HTTPRoute in template folder it should work the same way kustomize does. Besides I don't see why we'd want to override the base file for different env, but if we need to we can just use values file .
HTTPRoutes is essentially just another K8 manifest file that can get its values from value-<env>.yaml.
Also while you are at it , you might want to remove the hardcoded values and make it more template driven ?

Sahil-STFC · 2026-06-25T09:51:17Z

Message broker is deployed via helm , why are we adding Kustomize files ?

Kustomize files are for deploying HTTPRoute gateway configuration for accessing rabbitmq management UI

same as above

Sahil-STFC · 2026-06-25T09:51:27Z

same as above

Sahil-STFC · 2026-06-25T09:54:12Z

you'll need 2 values files - 1 for dev and second one for prod

Sahil-STFC · 2026-06-25T09:55:16Z

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: user-exchange-topology-chart


Chart name should be different

Sahil-STFC · 2026-06-25T09:59:02Z

+  vhost: {{ $.Values.uop_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain


You might wanna check this. This ensures your queue never gets deleted, even if you have removed it from the values.yaml file.
If that's what's intended then that's fine

My intention was to preserve the current behaviour. With the existing deployment of Bitnami helm charts, queues are imported via definitions.json, and removing them from the definitions does not automatically delete them from RabbitMQ. Using deletionPolicy: retain keeps that behaviour during the migration.

Sahil-STFC · 2026-06-25T10:01:24Z

Suggestion : If you have only 1 policy then its best to hard code the value, it will be easier for you to maintain

I'd like to keep this as a Helm template for consistency with other topology objects

Sahil-STFC · 2026-06-25T10:06:55Z

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: user-exchange-topology-chart


Name of the chart

…-uop-specific-rabbitmq-definitions

…ent>

…nge to location argocd/uex/<environment>

Sahil-STFC · 2026-06-26T12:36:08Z

+      type: ReplacePrefixMatch
+      replacePrefixMatch: ""
+  backendRef:
+    name: rmq-message-broker


same as above

Sahil-STFC · 2026-06-26T12:37:00Z

@@ -0,0 +1,17 @@
+httpRoute:
+  name: rmq-message-broker


Don't need this, this can be referenced from RMQ- message-broker values.yaml.

Sahil-STFC · 2026-06-26T12:37:10Z

@@ -0,0 +1,17 @@
+httpRoute:
+  name: rmq-message-broker
+  namespace: apps


same as above

Bhaswati1148 added 11 commits May 12, 2026 16:19

rabbitmq cluster operator configuration for UOP and fap results letter

63b0d46

change name of queue from upper case to lower

8959370

remove rabbitmq cluster name and namespace from values.yaml

5740770

queue name's case correction

0a5fcf1

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

6c624b2

…-uop-specific-rabbitmq-definitions

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

b8e84e2

…-uop-specific-rabbitmq-definitions

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

d0046ee

…-uop-specific-rabbitmq-definitions

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

3adbd0e

…-uop-specific-rabbitmq-definitions

add uop exchange vault secret

5675096

add fap results letter exchange secret

54290d0

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

f1f2b0d

…-uop-specific-rabbitmq-definitions

Bhaswati1148 requested review from a team as code owners June 15, 2026 16:28

Bhaswati1148 requested a review from bashanlam June 15, 2026 16:28

add argocd config changes and httproute configuration for rabbitmq cl…

0b283fe

…uster operator instance

Bhaswati1148 requested a review from a team as a code owner June 16, 2026 10:08

Sahil-STFC requested changes Jun 25, 2026

View reviewed changes

Bhaswati1148 added 11 commits June 25, 2026 12:06

Merge branch 'main' of https://github.com/isisbusapps/gitops into add…

bbdf2c6

…-uop-specific-rabbitmq-definitions

add the kustomization yaml files

371b9c1

add the httproute for prod

098ff5a

change values.yaml to value-dev.yaml

29d46b6

changes for review comments

efc8b98

corrections

4ee7240

adding values file for prod and correcting the chart name

1e9926a

adding httproute as helm template and removing kustomize

e6ea250

changing from sources to source

35dc61d

move file from argocd/<environment> location to argocd /uex/<environm…

1572044

…ent>

add argocd config files for uop-exchange and fap-results-letter-excha…

fc76645

…nge to location argocd/uex/<environment>

Bhaswati1148 requested a review from Sahil-STFC June 26, 2026 10:34

Sahil-STFC requested changes Jun 26, 2026

View reviewed changes

Bhaswati1148 added 2 commits June 26, 2026 14:03

some modifications

5ef70a4

review comments incorporation

30dfc9e

Bhaswati1148 requested a review from Sahil-STFC June 26, 2026 14:04

		@@ -0,0 +1,24 @@
		apiVersion: v2
		name: user-exchange-topology-chart

Uh oh!

Conversation

Bhaswati1148 commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Bhaswati1148 Jun 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sahil-STFC Jun 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Bhaswati1148 commented Jun 15, 2026 •

edited

Loading

Bhaswati1148 Jun 25, 2026 •

edited

Loading

Sahil-STFC Jun 25, 2026 •

edited

Loading