From 63b0d46736b3fbe30bc132ba379c412686cadad2 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Tue, 12 May 2026 16:19:56 +0100
Subject: [PATCH 01/19] rabbitmq cluster operator configuration for UOP and fap
 results letter

---
 .../app.yaml                                  | 38 ++++++++++++++
 .../uop-exchange-topology/app.yaml            | 38 ++++++++++++++
 .../.helmignore                               | 23 +++++++++
 .../Chart.yaml                                | 24 +++++++++
 .../fap-results-letters-bindings.yaml         | 16 ++++++
 .../fap-results-letters-exchanges.yaml        | 17 +++++++
 .../templates/fap-results-letters-queues.yaml | 17 +++++++
 .../fap-results-letters-user-permissions.yaml | 17 +++++++
 ...esults-letters-user-topic-permissions.yaml | 17 +++++++
 .../templates/fap-results-letters-user.yaml   | 19 +++++++
 .../templates/fap-results-letters-vhost.yaml  | 14 ++++++
 .../values.yaml                               | 28 +++++++++++
 .../uop-exchange-topology/.helmignore         | 23 +++++++++
 .../uop-exchange-topology/Chart.yaml          | 24 +++++++++
 .../templates/proposals-bindings.yaml         | 16 ++++++
 .../templates/proposals-exchanges.yaml        | 17 +++++++
 .../templates/proposals-policies.yaml         | 36 ++++++++++++++
 .../templates/proposals-queues.yaml           | 17 +++++++
 .../templates/proposals-user-permissions.yaml | 17 +++++++
 .../templates/proposals-user.yaml             | 19 +++++++
 .../templates/proposals-vhost.yaml            | 14 ++++++
 .../uop-exchange-topology/values.yaml         | 49 +++++++++++++++++++
 22 files changed, 500 insertions(+)
 create mode 100644 argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
 create mode 100644 argocd/dev/submissions/uop-exchange-topology/app.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/.helmignore
 create mode 100644 components/ra/fap-results-letters-exchange-topology/Chart.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-bindings.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-exchanges.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-queues.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-permissions.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-topic-permissions.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-vhost.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-topology/values.yaml
 create mode 100644 components/submissions/uop-exchange-topology/.helmignore
 create mode 100644 components/submissions/uop-exchange-topology/Chart.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-bindings.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-exchanges.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-user-permissions.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-user.yaml
 create mode 100644 components/submissions/uop-exchange-topology/templates/proposals-vhost.yaml
 create mode 100644 components/submissions/uop-exchange-topology/values.yaml

diff --git a/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
new file mode 100644
index 00000000..6562e666
--- /dev/null
+++ b/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: fap-results-letters-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-fap-results-letters-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: r-a-project
+      source:
+        path: components/ra/fap-results-letters-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: add-uop-specific-rabbitmq-definitions
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
+            - values.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file
diff --git a/argocd/dev/submissions/uop-exchange-topology/app.yaml b/argocd/dev/submissions/uop-exchange-topology/app.yaml
new file mode 100644
index 00000000..73c7ab54
--- /dev/null
+++ b/argocd/dev/submissions/uop-exchange-topology/app.yaml
@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: uop-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-uop-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: submissions-project
+      source:
+        path: components/submissions/uop-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: add-uop-specific-rabbitmq-definitions
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
+            - values.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/.helmignore b/components/ra/fap-results-letters-exchange-topology/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/components/ra/fap-results-letters-exchange-topology/Chart.yaml b/components/ra/fap-results-letters-exchange-topology/Chart.yaml
new file mode 100644
index 00000000..00dab8ce
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: user-exchange-topology-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.1.0"
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-bindings.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-bindings.yaml
new file mode 100644
index 00000000..fdba1f52
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-bindings.yaml
@@ -0,0 +1,16 @@
+{{- range .Values.binding }}
+apiVersion: rabbitmq.com/v1beta1
+kind: Binding
+metadata:
+  name: {{ .name | lower | replace "_" "-" }}-binding
+  namespace: {{ $.Values.namespace }}
+spec:
+  vhost: {{ $.Values.frl_exchange_vhost}}
+  routingKey: {{ index . "routing_key" }}
+  source: {{ .source }}
+  destination: {{ .destination }}
+  destinationType: {{ index . "destination_type" | default "queue"}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+{{ end }}
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-exchanges.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-exchanges.yaml
new file mode 100644
index 00000000..6a2be14e
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-exchanges.yaml
@@ -0,0 +1,17 @@
+{{- range .Values.exchange}}
+apiVersion: rabbitmq.com/v1beta1
+kind: Exchange
+metadata:
+  name: {{ .name | lower | replace "_" "-"}}-exchange
+  namespace: {{ $.Values.namespace }}  
+spec:
+  name: {{ .name }} 
+  autoDelete: {{ index . "auto-delete" | default "false" }}
+  durable: {{ .durable | default "true" }}
+  type: {{ .type | default "direct"}} 
+  vhost: {{ $.Values.frl_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain     
+---
+{{ end }}    
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-queues.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-queues.yaml
new file mode 100644
index 00000000..2d1a0d08
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-queues.yaml
@@ -0,0 +1,17 @@
+{{- range .Values.queue}}
+apiVersion: rabbitmq.com/v1beta1
+kind: Queue
+metadata:
+  name: {{ .name }}
+  namespace: {{ $.Values.namespace }}
+spec:
+  name: {{ .name }} 
+  autoDelete: {{ index . "auto-delete" | default "false" }}
+  durable: {{ .durable | default "true" }}
+  type: quorum
+  vhost: {{ $.Values.frl_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain
+---
+{{ end }}
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-permissions.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-permissions.yaml
new file mode 100644
index 00000000..5b47f0f4
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-permissions.yaml
@@ -0,0 +1,17 @@
+{{- range $user, $config := .Values.users }}
+apiVersion: rabbitmq.com/v1beta1
+kind: Permission
+metadata:
+  name: {{ $user }}-permission
+  namespace: {{ $.Values.namespace | default "apps" }}
+spec:
+  vhost: {{ $.Values.frl_exchange_vhost }}
+  user: {{ $user }}
+  permissions:
+    configure: {{ $config.permissions.configure | default "(?!)" }}
+    write: {{ $config.permissions.write | default "(?!)" }}
+    read: {{ $config.permissions.read | default "(?!)" }}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+{{- end }}
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-topic-permissions.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-topic-permissions.yaml
new file mode 100644
index 00000000..abc99ecd
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user-topic-permissions.yaml
@@ -0,0 +1,17 @@
+{{- range $user, $config := .Values.users }}
+apiVersion: rabbitmq.com/v1beta1
+kind: TopicPermission
+metadata:
+  name: {{ $user }}-topic-permission
+  namespace: {{ $.Values.namespace | default "apps" }}
+spec:
+  vhost: {{ $.Values.frl_exchange_vhost }}
+  user: {{ $user }}
+  permissions:
+    exchange: {{ $config.topicPermissions.exchange | quote }}
+    write: {{ $config.topicPermissions.write | default "(?!)" }}
+    read: {{ $config.topicPermissions.read | default "(?!)" }}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+{{- end }}
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user.yaml
new file mode 100644
index 00000000..145f5240
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-user.yaml
@@ -0,0 +1,19 @@
+{{- range $user, $config := .Values.users }}
+apiVersion: rabbitmq.com/v1beta1
+kind: User
+metadata:
+  name: {{ $user }}
+  namespace: {{ $.Values.namespace }}
+spec:  
+  {{- if $config.tags }}
+  tags:
+  {{- range $config.tags }}
+    - {{ . }}
+  {{- end }}
+  {{- end }}
+  importCredentialsSecret:
+    name: frl-exchange-secret
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}    
+---
+{{- end }}  
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-vhost.yaml b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-vhost.yaml
new file mode 100644
index 00000000..9b884fc0
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/templates/fap-results-letters-vhost.yaml
@@ -0,0 +1,14 @@
+apiVersion: rabbitmq.com/v1beta1
+kind: Vhost
+metadata:
+  name: {{ $.Values.frl_exchange_vhost }}
+  namespace: {{ $.Values.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-2"
+spec:
+  name: {{ $.Values.frl_exchange_vhost }}
+  defaultQueueType: quorum   # quorum | classic | stream
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain   
+  
\ No newline at end of file
diff --git a/components/ra/fap-results-letters-exchange-topology/values.yaml b/components/ra/fap-results-letters-exchange-topology/values.yaml
new file mode 100644
index 00000000..d9a315c5
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/values.yaml
@@ -0,0 +1,28 @@
+
+frl_exchange_vhost: fap-results-letters
+
+users:
+  fap-results-letters-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+    topicPermissions:
+      exchange:
+      write: .*
+      read: .*
+     
+exchange:
+ - name: fap-results-letters.fanout
+   type: fanout
+
+queue:
+ - name: FAP-Results-Letters
+
+binding:
+- name: FAP-Results-Letters
+  source: fap-results-letters.fanout
+  destination: FAP-Results-Letters
+  destination_type: queue
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/.helmignore b/components/submissions/uop-exchange-topology/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/components/submissions/uop-exchange-topology/Chart.yaml b/components/submissions/uop-exchange-topology/Chart.yaml
new file mode 100644
index 00000000..00dab8ce
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: user-exchange-topology-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.1.0"
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-bindings.yaml b/components/submissions/uop-exchange-topology/templates/proposals-bindings.yaml
new file mode 100644
index 00000000..f4c4a824
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-bindings.yaml
@@ -0,0 +1,16 @@
+{{- range .Values.binding }}
+apiVersion: rabbitmq.com/v1beta1
+kind: Binding
+metadata:
+  name: {{ .name | lower | replace "_" "-" }}-binding
+  namespace: {{ $.Values.namespace }}
+spec:
+  vhost: {{ $.Values.uop_exchange_vhost}}
+  routingKey: {{ index . "routing_key" }}
+  source: {{ .source }}
+  destination: {{ .destination }}
+  destinationType: {{ index . "destination_type" | default "queue"}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+{{ end }}
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-exchanges.yaml b/components/submissions/uop-exchange-topology/templates/proposals-exchanges.yaml
new file mode 100644
index 00000000..376afd73
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-exchanges.yaml
@@ -0,0 +1,17 @@
+{{- range .Values.exchange}}
+apiVersion: rabbitmq.com/v1beta1
+kind: Exchange
+metadata:
+  name: {{ .name | lower | replace "_" "-"}}-exchange
+  namespace: {{ $.Values.namespace }}  
+spec:
+  name: {{ .name }} 
+  autoDelete: {{ index . "auto-delete" | default "false" }}
+  durable: {{ .durable | default "true" }}
+  type: {{ .type | default "direct"}} 
+  vhost: {{ $.Values.uop_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain     
+---
+{{ end }}    
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml b/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
new file mode 100644
index 00000000..25b49e26
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
@@ -0,0 +1,36 @@
+{{- range .Values.policy }}
+apiVersion: rabbitmq.com/v1beta1
+kind: Policy
+metadata:
+  name: {{ .name | lower | replace "_" "-" }}-policy
+  namespace: {{ $.Values.namespace }}
+spec:
+  name: {{ .name }}
+  pattern: {{ .pattern }}
+  applyTo: {{ index . "apply-to" | default "queues"}}
+  definition:
+    {{- if index .definition "max-length" }}
+    max-length: {{ index .definition "max-length" }}
+    {{- end}}
+    {{- if index .definition "max-length-bytes" }}
+    max-length-bytes: {{ index .definition "max-length-bytes"}}
+    {{- end }}
+    {{- if index .definition "overflow" }}
+    overflow: {{ index .definition "overflow" }}
+    {{- end }}    
+    {{- if index .definition "dead-letter-exchange" }}
+    dead-letter-exchange: {{ index .definition "dead-letter-exchange" }}
+    {{- end }}
+    {{- if index .definition "dead-letter-routing-key" }}
+    dead-letter-routing-key: {{ index .definition "dead-letter-routing-key" }}
+    {{- end }}
+  {{- if hasKey . "priority" }}
+  priority: {{ .priority }}
+  {{- else }}
+  priority: {{ $.Values.policy_priority | default "100 "}}
+  {{- end }}
+  vhost: {{ $.Values.uop_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+ {{ end }}
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
new file mode 100644
index 00000000..00319156
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
@@ -0,0 +1,17 @@
+{{- range .Values.queue}}
+apiVersion: rabbitmq.com/v1beta1
+kind: Queue
+metadata:
+  name: {{ .name }}
+  namespace: {{ $.Values.namespace }}
+spec:
+  name: {{ .name }} 
+  autoDelete: {{ index . "auto-delete" | default "false" }}
+  durable: {{ .durable | default "true" }}
+  type: quorum
+  vhost: {{ $.Values.uop_exchange_vhost}}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain
+---
+{{ end }}
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-user-permissions.yaml b/components/submissions/uop-exchange-topology/templates/proposals-user-permissions.yaml
new file mode 100644
index 00000000..814c78a9
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-user-permissions.yaml
@@ -0,0 +1,17 @@
+{{- range $user, $config := .Values.users }}
+apiVersion: rabbitmq.com/v1beta1
+kind: Permission
+metadata:
+  name: {{ $user }}-permission
+  namespace: {{ $.Values.namespace | default "apps" }}
+spec:
+  vhost: {{ $.Values.uop_exchange_vhost }}
+  user: {{ $user }}
+  permissions:
+    configure: {{ $config.permissions.configure | default "(?!)" }}
+    write: {{ $config.permissions.write | default "(?!)" }}
+    read: {{ $config.permissions.read | default "(?!)" }}
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+---
+{{- end }}
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-user.yaml b/components/submissions/uop-exchange-topology/templates/proposals-user.yaml
new file mode 100644
index 00000000..0bc4ccbe
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-user.yaml
@@ -0,0 +1,19 @@
+{{- range $user, $config := .Values.users }}
+apiVersion: rabbitmq.com/v1beta1
+kind: User
+metadata:
+  name: {{ $user }}
+  namespace: {{ $.Values.namespace }}
+spec:  
+  {{- if $config.tags }}
+  tags:
+  {{- range $config.tags }}
+    - {{ . }}
+  {{- end }}
+  {{- end }}
+  importCredentialsSecret:
+    name: uop-exchange-secret
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}    
+---
+{{- end }}  
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-vhost.yaml b/components/submissions/uop-exchange-topology/templates/proposals-vhost.yaml
new file mode 100644
index 00000000..adff2433
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/templates/proposals-vhost.yaml
@@ -0,0 +1,14 @@
+apiVersion: rabbitmq.com/v1beta1
+kind: Vhost
+metadata:
+  name: {{ $.Values.uop_exchange_vhost }}
+  namespace: {{ $.Values.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-2"
+spec:
+  name: {{ $.Values.uop_exchange_vhost }}
+  defaultQueueType: quorum   # quorum | classic | stream
+  rabbitmqClusterReference:
+    name: {{ $.Values.rmq_cluster_name }}
+  deletionPolicy: retain   
+  
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/values.yaml b/components/submissions/uop-exchange-topology/values.yaml
new file mode 100644
index 00000000..af3cf0de
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/values.yaml
@@ -0,0 +1,49 @@
+
+rmq_cluster_name: rmq-message-broker
+namespace: apps
+uop_exchange_vhost: proposals
+
+users:
+  proposal-submission-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+  proposal-allocations-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+     
+
+exchange:
+ - name: user_office_backend.fanout
+   type: fanout
+ - name: allocations-dead-letter-exchange
+   type: direct
+
+queue:
+ - name: Proposal-Allocations
+ - name: allocations-dead-letter-queue
+
+binding:
+- name: Proposal-Allocations
+  source: user_office_backend.fanout
+  destination: Proposal-Allocations
+  destination_type: queue
+- name: allocations-dead-letter-queue
+  source: allocations-dead-letter-exchange
+  destination: allocations-dead-letter-queue
+  destination_type: queue
+  routing_key: dead
+
+policy:
+ - name: Proposal-Allocations
+   pattern: ^Proposal-Allocations$
+   definition:
+     dead-letter-exchange: allocations-dead-letter-exchange
+     dead-letter-routing-key: dead

From 895937044812f5089ca567248f4521cdd1b83787 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Tue, 12 May 2026 17:37:39 +0100
Subject: [PATCH 02/19] change name of queue from upper case to lower

---
 .../templates/proposals-queues.yaml                    |  2 +-
 .../submissions/uop-exchange-topology/values.yaml      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
index 00319156..8ea290b9 100644
--- a/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
+++ b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
@@ -2,7 +2,7 @@
 apiVersion: rabbitmq.com/v1beta1
 kind: Queue
 metadata:
-  name: {{ .name }}
+  name: {{ .name | lower }}
   namespace: {{ $.Values.namespace }}
 spec:
   name: {{ .name }} 
diff --git a/components/submissions/uop-exchange-topology/values.yaml b/components/submissions/uop-exchange-topology/values.yaml
index af3cf0de..690772bd 100644
--- a/components/submissions/uop-exchange-topology/values.yaml
+++ b/components/submissions/uop-exchange-topology/values.yaml
@@ -27,13 +27,13 @@ exchange:
    type: direct
 
 queue:
- - name: Proposal-Allocations
+ - name: proposal-allocations
  - name: allocations-dead-letter-queue
 
 binding:
-- name: Proposal-Allocations
+- name: proposal-allocations
   source: user_office_backend.fanout
-  destination: Proposal-Allocations
+  destination: proposal-allocations
   destination_type: queue
 - name: allocations-dead-letter-queue
   source: allocations-dead-letter-exchange
@@ -42,8 +42,8 @@ binding:
   routing_key: dead
 
 policy:
- - name: Proposal-Allocations
-   pattern: ^Proposal-Allocations$
+ - name: proposal-allocations
+   pattern: ^proposal-allocations$
    definition:
      dead-letter-exchange: allocations-dead-letter-exchange
      dead-letter-routing-key: dead

From 5740770f37fd24421de3172b464917dfbd37f66d Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Tue, 12 May 2026 18:18:56 +0100
Subject: [PATCH 03/19] remove rabbitmq cluster name and namespace from
 values.yaml

---
 components/submissions/uop-exchange-topology/values.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/submissions/uop-exchange-topology/values.yaml b/components/submissions/uop-exchange-topology/values.yaml
index 690772bd..d27920f5 100644
--- a/components/submissions/uop-exchange-topology/values.yaml
+++ b/components/submissions/uop-exchange-topology/values.yaml
@@ -1,6 +1,4 @@
 
-rmq_cluster_name: rmq-message-broker
-namespace: apps
 uop_exchange_vhost: proposals
 
 users:

From 0a5fcf12c1a37d33b148f21f9af37ba52cf0cf5b Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Tue, 12 May 2026 18:32:04 +0100
Subject: [PATCH 04/19] queue name's case correction

---
 .../ra/fap-results-letters-exchange-topology/values.yaml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ra/fap-results-letters-exchange-topology/values.yaml b/components/ra/fap-results-letters-exchange-topology/values.yaml
index d9a315c5..665cdaaa 100644
--- a/components/ra/fap-results-letters-exchange-topology/values.yaml
+++ b/components/ra/fap-results-letters-exchange-topology/values.yaml
@@ -19,10 +19,10 @@ exchange:
    type: fanout
 
 queue:
- - name: FAP-Results-Letters
+ - name: fap-results-letters
 
 binding:
-- name: FAP-Results-Letters
+- name: fap-results-letters
   source: fap-results-letters.fanout
-  destination: FAP-Results-Letters
+  destination: fap-results-letters
   destination_type: queue
\ No newline at end of file

From 5675096186ae463405c025093a4c6480f1b3f840 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Wed, 10 Jun 2026 13:48:06 +0100
Subject: [PATCH 05/19] add uop exchange vault secret

---
 .../uop-exchange-secret/.helmignore           | 23 ++++++++++++++++++
 .../uop-exchange-secret/Chart.yaml            | 24 +++++++++++++++++++
 .../templates/uop-exchange-static-secret.yaml | 22 +++++++++++++++++
 .../uop-exchange-secret/values-dev.yaml       |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 components/submissions/uop-exchange-secret/.helmignore
 create mode 100644 components/submissions/uop-exchange-secret/Chart.yaml
 create mode 100644 components/submissions/uop-exchange-secret/templates/uop-exchange-static-secret.yaml
 create mode 100644 components/submissions/uop-exchange-secret/values-dev.yaml

diff --git a/components/submissions/uop-exchange-secret/.helmignore b/components/submissions/uop-exchange-secret/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/components/submissions/uop-exchange-secret/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/components/submissions/uop-exchange-secret/Chart.yaml b/components/submissions/uop-exchange-secret/Chart.yaml
new file mode 100644
index 00000000..e332a8c5
--- /dev/null
+++ b/components/submissions/uop-exchange-secret/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: rmq-message-broker-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.2.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.2.0"
diff --git a/components/submissions/uop-exchange-secret/templates/uop-exchange-static-secret.yaml b/components/submissions/uop-exchange-secret/templates/uop-exchange-static-secret.yaml
new file mode 100644
index 00000000..c3ab6f63
--- /dev/null
+++ b/components/submissions/uop-exchange-secret/templates/uop-exchange-static-secret.yaml
@@ -0,0 +1,22 @@
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: VaultStaticSecret
+metadata:
+  name: uop-exchange-secret
+  namespace: apps
+spec:
+  type: kv-v2
+  refreshAfter: 30s
+  vaultAuthRef: static-auth
+  mount: uop
+  path: {{ $.Values.env }}/rabbitmq/
+  destination:
+    name: uop-exchange-secret
+    overwrite: true
+    create: true
+    transformation:
+      templates:
+        username:
+          text: "{{`{{ get .Secrets \"username\" }}`}}"
+        password:
+          text: "{{`{{ get .Secrets \"password\" }}`}}"
+
diff --git a/components/submissions/uop-exchange-secret/values-dev.yaml b/components/submissions/uop-exchange-secret/values-dev.yaml
new file mode 100644
index 00000000..4a067a0b
--- /dev/null
+++ b/components/submissions/uop-exchange-secret/values-dev.yaml
@@ -0,0 +1 @@
+env: dev
\ No newline at end of file

From 54290d05b6a21c53b271756cc6a26a2645dd8169 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Wed, 10 Jun 2026 17:51:15 +0100
Subject: [PATCH 06/19] add fap results letter exchange secret

---
 .../.helmignore                               | 23 ++++++++++++++++++
 .../Chart.yaml                                | 24 +++++++++++++++++++
 .../templates/frl-exchange-static-secret.yaml | 22 +++++++++++++++++
 .../values-dev.yaml                           |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 components/ra/fap-results-letters-exchange-secret/.helmignore
 create mode 100644 components/ra/fap-results-letters-exchange-secret/Chart.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-secret/templates/frl-exchange-static-secret.yaml
 create mode 100644 components/ra/fap-results-letters-exchange-secret/values-dev.yaml

diff --git a/components/ra/fap-results-letters-exchange-secret/.helmignore b/components/ra/fap-results-letters-exchange-secret/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-secret/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/components/ra/fap-results-letters-exchange-secret/Chart.yaml b/components/ra/fap-results-letters-exchange-secret/Chart.yaml
new file mode 100644
index 00000000..e332a8c5
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-secret/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: rmq-message-broker-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.2.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.2.0"
diff --git a/components/ra/fap-results-letters-exchange-secret/templates/frl-exchange-static-secret.yaml b/components/ra/fap-results-letters-exchange-secret/templates/frl-exchange-static-secret.yaml
new file mode 100644
index 00000000..cb303c80
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-secret/templates/frl-exchange-static-secret.yaml
@@ -0,0 +1,22 @@
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: VaultStaticSecret
+metadata:
+  name: frl-exchange-secret
+  namespace: apps
+spec:
+  type: kv-v2
+  refreshAfter: 30s
+  vaultAuthRef: static-auth
+  mount: reviews_and_allocations
+  path: {{ $.Values.env }}/rabbitmq/
+  destination:
+    name: frl-exchange-secret
+    overwrite: true
+    create: true
+    transformation:
+      templates:
+        username:
+          text: "{{`{{ get .Secrets \"username\" }}`}}"
+        password:
+          text: "{{`{{ get .Secrets \"password\" }}`}}"
+
diff --git a/components/ra/fap-results-letters-exchange-secret/values-dev.yaml b/components/ra/fap-results-letters-exchange-secret/values-dev.yaml
new file mode 100644
index 00000000..4a067a0b
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-secret/values-dev.yaml
@@ -0,0 +1 @@
+env: dev
\ No newline at end of file

From 0b283fea8029c47d6da237ade7d7b6105595d55a Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Tue, 16 Jun 2026 11:08:22 +0100
Subject: [PATCH 07/19] add argocd config changes and httproute configuration
 for rabbitmq cluster operator instance

---
 argocd/dev/shared/message-broker/app.yaml     | 19 ++++++++------
 .../shared/message-broker/base/httpRoute.yaml | 25 +++++++++++++++++++
 .../overlays/dev/kustomization.yaml           |  0
 .../overlays/prod/kustomization.yaml          |  0
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 components/shared/message-broker/base/httpRoute.yaml
 create mode 100644 components/shared/message-broker/overlays/dev/kustomization.yaml
 create mode 100644 components/shared/message-broker/overlays/prod/kustomization.yaml

diff --git a/argocd/dev/shared/message-broker/app.yaml b/argocd/dev/shared/message-broker/app.yaml
index bef35583..9ac452aa 100644
--- a/argocd/dev/shared/message-broker/app.yaml
+++ b/argocd/dev/shared/message-broker/app.yaml
@@ -20,13 +20,18 @@ spec:
         argocd.argoproj.io/sync-wave: "0"        
     spec:
       project: infrastructure-project
-      source:
-        path: components/shared/message-broker/rmq-message-broker-chart
-        repoURL: 'https://github.com/isisbusapps/gitops'
-        targetRevision: main
-        helm:
-          valueFiles:
-            - values.yaml
+      sources:
+        # Helm chart to install rabbitmq
+        - path: components/shared/message-broker/rmq-message-broker-chart
+          repoURL: 'https://github.com/isisbusapps/gitops'
+          targetRevision: main
+          helm:
+            valueFiles:
+             - values.yaml
+        # Kustomize config for ingress
+        - path: components/shared/message-broker/overlays/dev
+          repoURL: 'https://github.com/isisbusapps/gitops'
+          targetRevision: main
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/components/shared/message-broker/base/httpRoute.yaml b/components/shared/message-broker/base/httpRoute.yaml
new file mode 100644
index 00000000..5de180b1
--- /dev/null
+++ b/components/shared/message-broker/base/httpRoute.yaml
@@ -0,0 +1,25 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: rmq-message-broker
+  namespace: apps
+spec:
+  parentRefs:
+    - name: envoy-gateway
+      namespace: envoy-gateway-system
+  hostnames:
+    - "*.developers.facilities.rl.ac.uk"
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /rmq
+      filters:
+        - type: URLRewrite
+          urlRewrite:
+            path:
+              type: ReplacePrefixMatch
+              replacePrefixMatch: ""
+      backendRefs:
+        - name: rmq-message-broker
+          port: 15672
diff --git a/components/shared/message-broker/overlays/dev/kustomization.yaml b/components/shared/message-broker/overlays/dev/kustomization.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/components/shared/message-broker/overlays/prod/kustomization.yaml b/components/shared/message-broker/overlays/prod/kustomization.yaml
new file mode 100644
index 00000000..e69de29b

From 371b9c1b6edeab879707193923a60cd88ab394b2 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 12:26:29 +0100
Subject: [PATCH 08/19] add the kustomization yaml files

---
 .../shared/message-broker/overlays/dev/kustomization.yaml  | 7 +++++++
 .../shared/message-broker/overlays/prod/kustomization.yaml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/components/shared/message-broker/overlays/dev/kustomization.yaml b/components/shared/message-broker/overlays/dev/kustomization.yaml
index e69de29b..499897bf 100644
--- a/components/shared/message-broker/overlays/dev/kustomization.yaml
+++ b/components/shared/message-broker/overlays/dev/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+namespace: apps
diff --git a/components/shared/message-broker/overlays/prod/kustomization.yaml b/components/shared/message-broker/overlays/prod/kustomization.yaml
index e69de29b..499897bf 100644
--- a/components/shared/message-broker/overlays/prod/kustomization.yaml
+++ b/components/shared/message-broker/overlays/prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+namespace: apps

From 098ff5aa2081bbd2b808f305929247fb64e91698 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 12:27:20 +0100
Subject: [PATCH 09/19] add the httproute for prod

---
 argocd/uex/dev/shared/message-broker/app.yaml |  2 +-
 .../uex/prod/shared/message-broker/app.yaml   | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/argocd/uex/dev/shared/message-broker/app.yaml b/argocd/uex/dev/shared/message-broker/app.yaml
index 9ac452aa..0a39d862 100644
--- a/argocd/uex/dev/shared/message-broker/app.yaml
+++ b/argocd/uex/dev/shared/message-broker/app.yaml
@@ -28,7 +28,7 @@ spec:
           helm:
             valueFiles:
              - values.yaml
-        # Kustomize config for ingress
+        # Kustomize config for httproute
         - path: components/shared/message-broker/overlays/dev
           repoURL: 'https://github.com/isisbusapps/gitops'
           targetRevision: main
diff --git a/argocd/uex/prod/shared/message-broker/app.yaml b/argocd/uex/prod/shared/message-broker/app.yaml
index b387a192..e3db239f 100644
--- a/argocd/uex/prod/shared/message-broker/app.yaml
+++ b/argocd/uex/prod/shared/message-broker/app.yaml
@@ -20,13 +20,18 @@ spec:
         argocd.argoproj.io/sync-wave: "2"        
     spec:
       project: infrastructure-project
-      source:
-        path: components/shared/message-broker/rmq-message-broker-chart
-        repoURL: 'https://github.com/isisbusapps/gitops'
-        targetRevision: main
-        helm:
-          valueFiles:
-            - values.yaml
+      sources:
+        # Helm chart to install rabbitmq
+        - path: components/shared/message-broker/rmq-message-broker-chart
+          repoURL: 'https://github.com/isisbusapps/gitops'
+          targetRevision: main
+          helm:
+            valueFiles:
+             - values.yaml
+        # Kustomize config for httproute
+        - path: components/shared/message-broker/overlays/prod
+          repoURL: 'https://github.com/isisbusapps/gitops'
+          targetRevision: main
       destination:
         namespace: apps
         name: '{{.name}}'

From 29d46b6d900ce6dcfebadba4e67efbc5e10b9458 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 12:47:30 +0100
Subject: [PATCH 10/19] change values.yaml to value-dev.yaml

---
 argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml | 2 +-
 argocd/dev/submissions/uop-exchange-topology/app.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
index 6562e666..5ab79d38 100644
--- a/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
+++ b/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
@@ -28,7 +28,7 @@ spec:
           valueFiles:          
             - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
             - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
-            - values.yaml
+            - values-dev.yaml
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/argocd/dev/submissions/uop-exchange-topology/app.yaml b/argocd/dev/submissions/uop-exchange-topology/app.yaml
index 73c7ab54..86d1ece5 100644
--- a/argocd/dev/submissions/uop-exchange-topology/app.yaml
+++ b/argocd/dev/submissions/uop-exchange-topology/app.yaml
@@ -28,7 +28,7 @@ spec:
           valueFiles:          
             - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
             - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
-            - values.yaml
+            - values-dev.yaml
       destination:
         namespace: apps
         name: '{{.name}}'

From efc8b98d7075da6b29a65c01d074d7dfe34ffcd7 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 12:57:11 +0100
Subject: [PATCH 11/19] changes for review comments

---
 .../Chart.yaml                                |  2 +-
 .../{values.yaml => values-dev.yaml}          |  0
 .../values-prod.yaml                          | 28 +++++++++++
 .../uop-exchange-topology/Chart.yaml          |  2 +-
 .../{values.yaml => values-dev.yaml}          |  0
 .../uop-exchange-topology/values-prod.yaml    | 47 +++++++++++++++++++
 6 files changed, 77 insertions(+), 2 deletions(-)
 rename components/ra/fap-results-letters-exchange-topology/{values.yaml => values-dev.yaml} (100%)
 create mode 100644 components/ra/fap-results-letters-exchange-topology/values-prod.yaml
 rename components/submissions/uop-exchange-topology/{values.yaml => values-dev.yaml} (100%)
 create mode 100644 components/submissions/uop-exchange-topology/values-prod.yaml

diff --git a/components/ra/fap-results-letters-exchange-topology/Chart.yaml b/components/ra/fap-results-letters-exchange-topology/Chart.yaml
index 00dab8ce..5b20bd44 100644
--- a/components/ra/fap-results-letters-exchange-topology/Chart.yaml
+++ b/components/ra/fap-results-letters-exchange-topology/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: user-exchange-topology-chart
+name: frl-exchange-topology-chart
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/components/ra/fap-results-letters-exchange-topology/values.yaml b/components/ra/fap-results-letters-exchange-topology/values-dev.yaml
similarity index 100%
rename from components/ra/fap-results-letters-exchange-topology/values.yaml
rename to components/ra/fap-results-letters-exchange-topology/values-dev.yaml
diff --git a/components/ra/fap-results-letters-exchange-topology/values-prod.yaml b/components/ra/fap-results-letters-exchange-topology/values-prod.yaml
new file mode 100644
index 00000000..665cdaaa
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-topology/values-prod.yaml
@@ -0,0 +1,28 @@
+
+frl_exchange_vhost: fap-results-letters
+
+users:
+  fap-results-letters-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+    topicPermissions:
+      exchange:
+      write: .*
+      read: .*
+     
+exchange:
+ - name: fap-results-letters.fanout
+   type: fanout
+
+queue:
+ - name: fap-results-letters
+
+binding:
+- name: fap-results-letters
+  source: fap-results-letters.fanout
+  destination: fap-results-letters
+  destination_type: queue
\ No newline at end of file
diff --git a/components/submissions/uop-exchange-topology/Chart.yaml b/components/submissions/uop-exchange-topology/Chart.yaml
index 00dab8ce..fbe287d2 100644
--- a/components/submissions/uop-exchange-topology/Chart.yaml
+++ b/components/submissions/uop-exchange-topology/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: user-exchange-topology-chart
+name: uop-exchange-topology-chart
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/components/submissions/uop-exchange-topology/values.yaml b/components/submissions/uop-exchange-topology/values-dev.yaml
similarity index 100%
rename from components/submissions/uop-exchange-topology/values.yaml
rename to components/submissions/uop-exchange-topology/values-dev.yaml
diff --git a/components/submissions/uop-exchange-topology/values-prod.yaml b/components/submissions/uop-exchange-topology/values-prod.yaml
new file mode 100644
index 00000000..d27920f5
--- /dev/null
+++ b/components/submissions/uop-exchange-topology/values-prod.yaml
@@ -0,0 +1,47 @@
+
+uop_exchange_vhost: proposals
+
+users:
+  proposal-submission-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+  proposal-allocations-user:
+    tags:
+     - management
+    permissions:
+      configure: .*
+      write: .*
+      read: .*
+     
+
+exchange:
+ - name: user_office_backend.fanout
+   type: fanout
+ - name: allocations-dead-letter-exchange
+   type: direct
+
+queue:
+ - name: proposal-allocations
+ - name: allocations-dead-letter-queue
+
+binding:
+- name: proposal-allocations
+  source: user_office_backend.fanout
+  destination: proposal-allocations
+  destination_type: queue
+- name: allocations-dead-letter-queue
+  source: allocations-dead-letter-exchange
+  destination: allocations-dead-letter-queue
+  destination_type: queue
+  routing_key: dead
+
+policy:
+ - name: proposal-allocations
+   pattern: ^proposal-allocations$
+   definition:
+     dead-letter-exchange: allocations-dead-letter-exchange
+     dead-letter-routing-key: dead

From 4ee72407012d492705f968d2dda926df0fbd1de0 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 13:52:11 +0100
Subject: [PATCH 12/19] corrections

---
 components/ra/fap-results-letters-exchange-secret/Chart.yaml    | 2 +-
 .../ra/fap-results-letters-exchange-secret/values-prod.yaml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 components/ra/fap-results-letters-exchange-secret/values-prod.yaml

diff --git a/components/ra/fap-results-letters-exchange-secret/Chart.yaml b/components/ra/fap-results-letters-exchange-secret/Chart.yaml
index e332a8c5..1f069ef2 100644
--- a/components/ra/fap-results-letters-exchange-secret/Chart.yaml
+++ b/components/ra/fap-results-letters-exchange-secret/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: rmq-message-broker-chart
+name: frl-exchange-secret-chart
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/components/ra/fap-results-letters-exchange-secret/values-prod.yaml b/components/ra/fap-results-letters-exchange-secret/values-prod.yaml
new file mode 100644
index 00000000..46b998ba
--- /dev/null
+++ b/components/ra/fap-results-letters-exchange-secret/values-prod.yaml
@@ -0,0 +1 @@
+env: prod
\ No newline at end of file

From 1e9926a5404da59429dd12ebf412aed1eec4bc5a Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 13:55:19 +0100
Subject: [PATCH 13/19] adding values file for prod and correcting the chart
 name

---
 components/submissions/uop-exchange-secret/Chart.yaml       | 2 +-
 components/submissions/uop-exchange-secret/values-prod.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 components/submissions/uop-exchange-secret/values-prod.yaml

diff --git a/components/submissions/uop-exchange-secret/Chart.yaml b/components/submissions/uop-exchange-secret/Chart.yaml
index e332a8c5..442aeafa 100644
--- a/components/submissions/uop-exchange-secret/Chart.yaml
+++ b/components/submissions/uop-exchange-secret/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: rmq-message-broker-chart
+name: uop-exchange-secret-chart
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/components/submissions/uop-exchange-secret/values-prod.yaml b/components/submissions/uop-exchange-secret/values-prod.yaml
new file mode 100644
index 00000000..46b998ba
--- /dev/null
+++ b/components/submissions/uop-exchange-secret/values-prod.yaml
@@ -0,0 +1 @@
+env: prod
\ No newline at end of file

From e6ea25017b1c3a7b0d0fbbe0095c426ff363df40 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 17:31:02 +0100
Subject: [PATCH 14/19] adding httproute as helm template and removing
 kustomize

---
 .../uop-exchange-topology/app.yaml            |  6 ++---
 argocd/uex/dev/shared/message-broker/app.yaml |  5 +---
 .../uex/prod/shared/message-broker/app.yaml   |  5 +---
 .../shared/message-broker/base/httpRoute.yaml | 25 -------------------
 .../overlays/dev/kustomization.yaml           |  7 ------
 .../overlays/prod/kustomization.yaml          |  7 ------
 .../templates/httpRoute.yaml                  | 25 +++++++++++++++++++
 .../values-httpRoute.yaml                     | 17 +++++++++++++
 8 files changed, 47 insertions(+), 50 deletions(-)
 delete mode 100644 components/shared/message-broker/base/httpRoute.yaml
 delete mode 100644 components/shared/message-broker/overlays/dev/kustomization.yaml
 delete mode 100644 components/shared/message-broker/overlays/prod/kustomization.yaml
 create mode 100644 components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
 create mode 100644 components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml

diff --git a/argocd/dev/submissions/uop-exchange-topology/app.yaml b/argocd/dev/submissions/uop-exchange-topology/app.yaml
index 86d1ece5..2a0f3f46 100644
--- a/argocd/dev/submissions/uop-exchange-topology/app.yaml
+++ b/argocd/dev/submissions/uop-exchange-topology/app.yaml
@@ -23,11 +23,11 @@ spec:
       source:
         path: components/submissions/uop-exchange-topology
         repoURL: 'https://github.com/isisbusapps/gitops'
-        targetRevision: add-uop-specific-rabbitmq-definitions
+        targetRevision: main
         helm:
           valueFiles:          
-            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
-            - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
+            - ../../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../../shared/message-broker-admin/message-broker-admin-chart/values-dev.yaml
             - values-dev.yaml
       destination:
         namespace: apps
diff --git a/argocd/uex/dev/shared/message-broker/app.yaml b/argocd/uex/dev/shared/message-broker/app.yaml
index 0a39d862..872ed0ac 100644
--- a/argocd/uex/dev/shared/message-broker/app.yaml
+++ b/argocd/uex/dev/shared/message-broker/app.yaml
@@ -28,10 +28,7 @@ spec:
           helm:
             valueFiles:
              - values.yaml
-        # Kustomize config for httproute
-        - path: components/shared/message-broker/overlays/dev
-          repoURL: 'https://github.com/isisbusapps/gitops'
-          targetRevision: main
+             - values-httpRoute.yaml
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/argocd/uex/prod/shared/message-broker/app.yaml b/argocd/uex/prod/shared/message-broker/app.yaml
index e3db239f..076760d1 100644
--- a/argocd/uex/prod/shared/message-broker/app.yaml
+++ b/argocd/uex/prod/shared/message-broker/app.yaml
@@ -28,10 +28,7 @@ spec:
           helm:
             valueFiles:
              - values.yaml
-        # Kustomize config for httproute
-        - path: components/shared/message-broker/overlays/prod
-          repoURL: 'https://github.com/isisbusapps/gitops'
-          targetRevision: main
+             - values-httpRoute.yaml
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/components/shared/message-broker/base/httpRoute.yaml b/components/shared/message-broker/base/httpRoute.yaml
deleted file mode 100644
index 5de180b1..00000000
--- a/components/shared/message-broker/base/httpRoute.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: rmq-message-broker
-  namespace: apps
-spec:
-  parentRefs:
-    - name: envoy-gateway
-      namespace: envoy-gateway-system
-  hostnames:
-    - "*.developers.facilities.rl.ac.uk"
-  rules:
-    - matches:
-        - path:
-            type: PathPrefix
-            value: /rmq
-      filters:
-        - type: URLRewrite
-          urlRewrite:
-            path:
-              type: ReplacePrefixMatch
-              replacePrefixMatch: ""
-      backendRefs:
-        - name: rmq-message-broker
-          port: 15672
diff --git a/components/shared/message-broker/overlays/dev/kustomization.yaml b/components/shared/message-broker/overlays/dev/kustomization.yaml
deleted file mode 100644
index 499897bf..00000000
--- a/components/shared/message-broker/overlays/dev/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - ../../base
-
-namespace: apps
diff --git a/components/shared/message-broker/overlays/prod/kustomization.yaml b/components/shared/message-broker/overlays/prod/kustomization.yaml
deleted file mode 100644
index 499897bf..00000000
--- a/components/shared/message-broker/overlays/prod/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - ../../base
-
-namespace: apps
diff --git a/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml b/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
new file mode 100644
index 00000000..03a05cad
--- /dev/null
+++ b/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
@@ -0,0 +1,25 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $.Values.httpRoute.name }}
+  namespace: {{ $.Values.httpRoute.namespace }}
+spec:
+  parentRefs:
+    - name: {{ $.Values.httpRoute.parentRef.name }}
+      namespace: {{ $.Values.httpRoute.parentRef.namespace }}
+  hostnames:
+    - {{ $.Values.httpRoute.hostnames | quote }}
+  rules:
+    - matches:
+        - path:
+            type: {{ $.Values.httpRoute.path.type }}
+            value: {{ $.Values.httpRoute.path.value }}
+      filters:
+        - type: URLRewrite
+          urlRewrite:
+            path:
+              type: {{ $.Values.httpRoute.rewrite.path.type }}
+              replacePrefixMatch: {{ $.Values.httpRoute.rewrite.path.replacePrefixMatch }}
+      backendRefs:
+        - name: {{ $.Values.httpRoute.backendRef.name }}
+          port: {{ $.Values.httpRoute.backendRef.port }}
diff --git a/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml b/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml
new file mode 100644
index 00000000..6f2f6516
--- /dev/null
+++ b/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml
@@ -0,0 +1,17 @@
+httpRoute:
+  name: rmq-message-broker
+  namespace: apps
+  parentRef:
+    name: envoy-gateway
+    namespace: envoy-gateway-system
+  hostnames: "*.developers.facilities.rl.ac.uk"
+  path:
+    type: PathPrefix
+    value: /rmq
+  rewrite:
+    path:
+      type: ReplacePrefixMatch
+      replacePrefixMatch: ""
+  backendRef:
+    name: rmq-message-broker
+    port: 15672
\ No newline at end of file

From 35dc61d751e240c6338a3f9c17f1f2b5d4375043 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Thu, 25 Jun 2026 17:45:09 +0100
Subject: [PATCH 15/19] changing from sources to source

---
 argocd/uex/dev/shared/message-broker/app.yaml  | 17 ++++++++---------
 argocd/uex/prod/shared/message-broker/app.yaml | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/argocd/uex/dev/shared/message-broker/app.yaml b/argocd/uex/dev/shared/message-broker/app.yaml
index 872ed0ac..7ef16aae 100644
--- a/argocd/uex/dev/shared/message-broker/app.yaml
+++ b/argocd/uex/dev/shared/message-broker/app.yaml
@@ -20,15 +20,14 @@ spec:
         argocd.argoproj.io/sync-wave: "0"        
     spec:
       project: infrastructure-project
-      sources:
-        # Helm chart to install rabbitmq
-        - path: components/shared/message-broker/rmq-message-broker-chart
-          repoURL: 'https://github.com/isisbusapps/gitops'
-          targetRevision: main
-          helm:
-            valueFiles:
-             - values.yaml
-             - values-httpRoute.yaml
+      source:
+        path: components/shared/message-broker/rmq-message-broker-chart
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values.yaml
+            - values-httpRoute.yaml
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/argocd/uex/prod/shared/message-broker/app.yaml b/argocd/uex/prod/shared/message-broker/app.yaml
index 076760d1..611ce5e1 100644
--- a/argocd/uex/prod/shared/message-broker/app.yaml
+++ b/argocd/uex/prod/shared/message-broker/app.yaml
@@ -20,15 +20,14 @@ spec:
         argocd.argoproj.io/sync-wave: "2"        
     spec:
       project: infrastructure-project
-      sources:
-        # Helm chart to install rabbitmq
-        - path: components/shared/message-broker/rmq-message-broker-chart
-          repoURL: 'https://github.com/isisbusapps/gitops'
-          targetRevision: main
-          helm:
-            valueFiles:
-             - values.yaml
-             - values-httpRoute.yaml
+      source:
+        path: components/shared/message-broker/rmq-message-broker-chart
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values.yaml
+            - values-httpRoute.yaml
       destination:
         namespace: apps
         name: '{{.name}}'

From 157204487560edaa5f1a4a72e3865d09f884e21d Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Fri, 26 Jun 2026 09:39:06 +0100
Subject: [PATCH 16/19] move file  from argocd/<environment> location to argocd
 /uex/<environment>

---
 .../app.yaml                                  | 38 -------------------
 .../uop-exchange-topology/app.yaml            | 38 -------------------
 2 files changed, 76 deletions(-)
 delete mode 100644 argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
 delete mode 100644 argocd/dev/submissions/uop-exchange-topology/app.yaml

diff --git a/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
deleted file mode 100644
index 5ab79d38..00000000
--- a/argocd/dev/ra/fap-results-letters-exchange-topology/app.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: fap-results-letters-exchange-topology
-  namespace: argocd
-spec:
-  goTemplate: true
-  goTemplateOptions: ["missingkey=error"]
-  generators:
-  - list:
-      elements:
-        # Names of clusters to deploy the app to
-        - name: dev-v3
-        # Uncomment if you want to deploy to dev-microk8s-alternative
-        #- name: dev-microk8s-alternative
-  template:
-    metadata:
-      name: '{{.name}}-fap-results-letters-exchange-topology'
-      annotations:
-        argocd.argoproj.io/sync-wave: "0"        
-    spec:
-      project: r-a-project
-      source:
-        path: components/ra/fap-results-letters-exchange-topology
-        repoURL: 'https://github.com/isisbusapps/gitops'
-        targetRevision: add-uop-specific-rabbitmq-definitions
-        helm:
-          valueFiles:          
-            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
-            - ../../shared/message-broker-admin/message-broker-admin-chart/values.yaml
-            - values-dev.yaml
-      destination:
-        namespace: apps
-        name: '{{.name}}'
-      syncPolicy:
-        automated: 
-          selfHeal: true
-          enabled: true
\ No newline at end of file
diff --git a/argocd/dev/submissions/uop-exchange-topology/app.yaml b/argocd/dev/submissions/uop-exchange-topology/app.yaml
deleted file mode 100644
index 2a0f3f46..00000000
--- a/argocd/dev/submissions/uop-exchange-topology/app.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: uop-exchange-topology
-  namespace: argocd
-spec:
-  goTemplate: true
-  goTemplateOptions: ["missingkey=error"]
-  generators:
-  - list:
-      elements:
-        # Names of clusters to deploy the app to
-        - name: dev-v3
-        # Uncomment if you want to deploy to dev-microk8s-alternative
-        #- name: dev-microk8s-alternative
-  template:
-    metadata:
-      name: '{{.name}}-uop-exchange-topology'
-      annotations:
-        argocd.argoproj.io/sync-wave: "0"        
-    spec:
-      project: submissions-project
-      source:
-        path: components/submissions/uop-exchange-topology
-        repoURL: 'https://github.com/isisbusapps/gitops'
-        targetRevision: main
-        helm:
-          valueFiles:          
-            - ../../../shared/message-broker/rmq-message-broker-chart/values.yaml
-            - ../../../shared/message-broker-admin/message-broker-admin-chart/values-dev.yaml
-            - values-dev.yaml
-      destination:
-        namespace: apps
-        name: '{{.name}}'
-      syncPolicy:
-        automated: 
-          selfHeal: true
-          enabled: true
\ No newline at end of file

From fc76645e92d2c2e33de534fe55f9653efeb17be6 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Fri, 26 Jun 2026 09:41:38 +0100
Subject: [PATCH 17/19] add argocd config files for uop-exchange and
 fap-results-letter-exchange to location argocd/uex/<environment>

---
 .../app.yaml                                  | 35 +++++++++++++++++
 .../app.yaml                                  | 38 +++++++++++++++++++
 .../submissions/uop-exchange-secret/app.yaml  | 35 +++++++++++++++++
 .../uop-exchange-topology/app.yaml            | 38 +++++++++++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 argocd/uex/dev/ra/fap-results-letters-exchange-secret/app.yaml
 create mode 100644 argocd/uex/dev/ra/fap-results-letters-exchange-topology/app.yaml
 create mode 100644 argocd/uex/dev/submissions/uop-exchange-secret/app.yaml
 create mode 100644 argocd/uex/dev/submissions/uop-exchange-topology/app.yaml

diff --git a/argocd/uex/dev/ra/fap-results-letters-exchange-secret/app.yaml b/argocd/uex/dev/ra/fap-results-letters-exchange-secret/app.yaml
new file mode 100644
index 00000000..91f10bc2
--- /dev/null
+++ b/argocd/uex/dev/ra/fap-results-letters-exchange-secret/app.yaml
@@ -0,0 +1,35 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: frl-exchange-secret
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-frl-exchange-secret'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"
+    spec:
+      project: r-a-project
+      source:
+        path:  components/ra/fap-results-letters-exchange-secret
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values-dev.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
\ No newline at end of file
diff --git a/argocd/uex/dev/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/uex/dev/ra/fap-results-letters-exchange-topology/app.yaml
new file mode 100644
index 00000000..596b76c4
--- /dev/null
+++ b/argocd/uex/dev/ra/fap-results-letters-exchange-topology/app.yaml
@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: frl-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-frl-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: r-a-project
+      source:
+        path: components/ra/fap-results-letters-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: add-uop-specific-rabbitmq-definitions
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values-dev.yaml
+            - values-dev.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file
diff --git a/argocd/uex/dev/submissions/uop-exchange-secret/app.yaml b/argocd/uex/dev/submissions/uop-exchange-secret/app.yaml
new file mode 100644
index 00000000..a4adc252
--- /dev/null
+++ b/argocd/uex/dev/submissions/uop-exchange-secret/app.yaml
@@ -0,0 +1,35 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: uop-exchange-secret
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-uop-exchange-secret'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"
+    spec:
+      project: submissions-project
+      source:
+        path:  components/submissions/uop-exchange-secret
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values-dev.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
\ No newline at end of file
diff --git a/argocd/uex/dev/submissions/uop-exchange-topology/app.yaml b/argocd/uex/dev/submissions/uop-exchange-topology/app.yaml
new file mode 100644
index 00000000..37f88d48
--- /dev/null
+++ b/argocd/uex/dev/submissions/uop-exchange-topology/app.yaml
@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: uop-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: dev-v3
+        # Uncomment if you want to deploy to dev-microk8s-alternative
+        #- name: dev-microk8s-alternative
+  template:
+    metadata:
+      name: '{{.name}}-uop-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: submissions-project
+      source:
+        path: components/submissions/uop-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values-dev.yaml
+            - values-dev.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file

From 5ef70a420fe02d5faf1984355805a02ce5ec0bb9 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Fri, 26 Jun 2026 14:03:45 +0100
Subject: [PATCH 18/19] some modifications

---
 .../templates/proposals-policies.yaml              | 14 --------------
 .../templates/proposals-queues.yaml                |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml b/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
index 25b49e26..c723744b 100644
--- a/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
+++ b/components/submissions/uop-exchange-topology/templates/proposals-policies.yaml
@@ -9,26 +9,12 @@ spec:
   pattern: {{ .pattern }}
   applyTo: {{ index . "apply-to" | default "queues"}}
   definition:
-    {{- if index .definition "max-length" }}
-    max-length: {{ index .definition "max-length" }}
-    {{- end}}
-    {{- if index .definition "max-length-bytes" }}
-    max-length-bytes: {{ index .definition "max-length-bytes"}}
-    {{- end }}
-    {{- if index .definition "overflow" }}
-    overflow: {{ index .definition "overflow" }}
-    {{- end }}    
     {{- if index .definition "dead-letter-exchange" }}
     dead-letter-exchange: {{ index .definition "dead-letter-exchange" }}
     {{- end }}
     {{- if index .definition "dead-letter-routing-key" }}
     dead-letter-routing-key: {{ index .definition "dead-letter-routing-key" }}
     {{- end }}
-  {{- if hasKey . "priority" }}
-  priority: {{ .priority }}
-  {{- else }}
-  priority: {{ $.Values.policy_priority | default "100 "}}
-  {{- end }}
   vhost: {{ $.Values.uop_exchange_vhost}}
   rabbitmqClusterReference:
     name: {{ $.Values.rmq_cluster_name }}
diff --git a/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
index 8ea290b9..bc24a573 100644
--- a/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
+++ b/components/submissions/uop-exchange-topology/templates/proposals-queues.yaml
@@ -2,7 +2,7 @@
 apiVersion: rabbitmq.com/v1beta1
 kind: Queue
 metadata:
-  name: {{ .name | lower }}
+  name: {{ .name | lower | replace "_" "-"}}-queue
   namespace: {{ $.Values.namespace }}
 spec:
   name: {{ .name }} 

From 30dfc9e493ed0065418b34505538d2727aeedd38 Mon Sep 17 00:00:00 2001
From: Bhaswati Dey <bhaswati1148@gmail.com>
Date: Fri, 26 Jun 2026 14:48:06 +0100
Subject: [PATCH 19/19] review comments incorporation

---
 .../rmq-message-broker-chart/templates/httpRoute.yaml       | 6 +++---
 .../rmq-message-broker-chart/values-httpRoute.yaml          | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml b/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
index 03a05cad..1ba6a1bc 100644
--- a/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
+++ b/components/shared/message-broker/rmq-message-broker-chart/templates/httpRoute.yaml
@@ -1,8 +1,8 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: {{ $.Values.httpRoute.name }}
-  namespace: {{ $.Values.httpRoute.namespace }}
+  name: {{ $.Values.rmq_cluster_name }}
+  namespace: {{ $.Values.namespace }}
 spec:
   parentRefs:
     - name: {{ $.Values.httpRoute.parentRef.name }}
@@ -21,5 +21,5 @@ spec:
               type: {{ $.Values.httpRoute.rewrite.path.type }}
               replacePrefixMatch: {{ $.Values.httpRoute.rewrite.path.replacePrefixMatch }}
       backendRefs:
-        - name: {{ $.Values.httpRoute.backendRef.name }}
+        - name: {{ $.Values.rmq_cluster_name }}
           port: {{ $.Values.httpRoute.backendRef.port }}
diff --git a/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml b/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml
index 6f2f6516..e52f7762 100644
--- a/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml
+++ b/components/shared/message-broker/rmq-message-broker-chart/values-httpRoute.yaml
@@ -1,6 +1,4 @@
 httpRoute:
-  name: rmq-message-broker
-  namespace: apps
   parentRef:
     name: envoy-gateway
     namespace: envoy-gateway-system
@@ -13,5 +11,4 @@ httpRoute:
       type: ReplacePrefixMatch
       replacePrefixMatch: ""
   backendRef:
-    name: rmq-message-broker
     port: 15672
\ No newline at end of file