From eb27aa8dd26728c42782edf12599007c97faf779 Mon Sep 17 00:00:00 2001 From: Bhaswati Dey Date: Wed, 2 Sep 2026 12:41:51 +0100 Subject: [PATCH 1/3] add vault secrets and rabbitmq topology argocd cd configuration --- .../ra/allocations-exchange-secret/app.yaml | 34 +++++++++++++++++ .../app.yaml | 34 +++++++++++++++++ .../app.yaml | 37 +++++++++++++++++++ .../submissions/uop-exchange-secret/app.yaml | 34 +++++++++++++++++ .../uop-exchange-topology/app.yaml | 37 +++++++++++++++++++ 5 files changed, 176 insertions(+) create mode 100644 argocd/uex/prod/ra/allocations-exchange-secret/app.yaml create mode 100644 argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml create mode 100644 argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml create mode 100644 argocd/uex/prod/submissions/uop-exchange-secret/app.yaml create mode 100644 argocd/uex/prod/submissions/uop-exchange-topology/app.yaml diff --git a/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml b/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml new file mode 100644 index 00000000..eea61fe9 --- /dev/null +++ b/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml @@ -0,0 +1,34 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: allocations-exchange-secret + namespace: argocd +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - list: + elements: + # Names of clusters to deploy the app to + - name: prod-v4 + - name: prod-fallback + template: + metadata: + name: '{{.name}}-allocations-exchange-secret' + annotations: + argocd.argoproj.io/sync-wave: "0" + spec: + project: r-a-project + source: + path: components/ra/allocations-exchange-secret + repoURL: 'https://github.com/isisbusapps/gitops' + targetRevision: main + helm: + valueFiles: + - values-prod.yaml + destination: + namespace: apps + name: '{{.name}}' + syncPolicy: + automated: + selfHeal: true \ No newline at end of file diff --git a/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml b/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml new file mode 100644 index 00000000..5ffe30d7 --- /dev/null +++ b/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml @@ -0,0 +1,34 @@ +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: prod-v4 + - name: prod-fallback + 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-prod.yaml + destination: + namespace: apps + name: '{{.name}}' + syncPolicy: + automated: + selfHeal: true \ No newline at end of file diff --git a/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml new file mode 100644 index 00000000..37c10c12 --- /dev/null +++ b/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml @@ -0,0 +1,37 @@ +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: prod-v4 + - name: prod-fallback + 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: main + helm: + valueFiles: + - ../../shared/message-broker/rmq-message-broker-chart/values.yaml + - ../../shared/message-broker-admin/message-broker-admin-chart/values-prod.yaml + - values-prod.yaml + destination: + namespace: apps + name: '{{.name}}' + syncPolicy: + automated: + selfHeal: true + enabled: true \ No newline at end of file diff --git a/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml b/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml new file mode 100644 index 00000000..a720e1f6 --- /dev/null +++ b/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml @@ -0,0 +1,34 @@ +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: prod-v4 + - name: prod-fallback + 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-prod.yaml + destination: + namespace: apps + name: '{{.name}}' + syncPolicy: + automated: + selfHeal: true diff --git a/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml b/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml new file mode 100644 index 00000000..fd7fc1ab --- /dev/null +++ b/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml @@ -0,0 +1,37 @@ +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: prod-v4 + - name: prod-fallback + 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-prod.yaml + - values-prod.yaml + destination: + namespace: apps + name: '{{.name}}' + syncPolicy: + automated: + selfHeal: true + enabled: true \ No newline at end of file From 9b7b4e08050daa4a2346229e1d89c9895b3cb796 Mon Sep 17 00:00:00 2001 From: Bhaswati Dey Date: Wed, 2 Sep 2026 12:46:06 +0100 Subject: [PATCH 2/3] deploy rabbitmq cluster operator in prod fallback cluster --- argocd/uex/prod/shared/cert-manager/apps.yaml | 3 +-- argocd/uex/prod/shared/message-broker-admin/app.yaml | 3 +-- argocd/uex/prod/shared/message-broker/app.yaml | 9 +++++++-- .../shared/rabbitmq-operators/cluster-operator/apps.yaml | 3 +-- .../rabbitmq-operators/topology-operator/apps.yaml | 3 +-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/argocd/uex/prod/shared/cert-manager/apps.yaml b/argocd/uex/prod/shared/cert-manager/apps.yaml index 2406f9d4..7405bee9 100644 --- a/argocd/uex/prod/shared/cert-manager/apps.yaml +++ b/argocd/uex/prod/shared/cert-manager/apps.yaml @@ -11,8 +11,7 @@ spec: elements: # Names of clusters to deploy the app to - name: prod-v4 - # Uncomment if you want to deploy to prod-fallback - #- name: prod-fallback + - name: prod-fallback template: metadata: name: cert-manager diff --git a/argocd/uex/prod/shared/message-broker-admin/app.yaml b/argocd/uex/prod/shared/message-broker-admin/app.yaml index 04e49a84..e237df62 100644 --- a/argocd/uex/prod/shared/message-broker-admin/app.yaml +++ b/argocd/uex/prod/shared/message-broker-admin/app.yaml @@ -11,8 +11,7 @@ spec: elements: # Names of clusters to deploy the app to - name: prod-v4 - # Uncomment if you want to deploy to prod-fallback - #- name: prod-fallback + - name: prod-fallback template: metadata: name: '{{.name}}-message-broker-admin' diff --git a/argocd/uex/prod/shared/message-broker/app.yaml b/argocd/uex/prod/shared/message-broker/app.yaml index 611ce5e1..973927d4 100644 --- a/argocd/uex/prod/shared/message-broker/app.yaml +++ b/argocd/uex/prod/shared/message-broker/app.yaml @@ -11,8 +11,10 @@ spec: elements: # Names of clusters to deploy the app to - name: prod-v4 - # Uncomment if you want to deploy to prod-fallback - #- name: prod-fallback + storageClassName: csi-cinder + + - name: prod-fallback + storageClassName: microk8s-hostpath template: metadata: name: '{{.name}}-rmq-message-broker' @@ -28,6 +30,9 @@ spec: valueFiles: - values.yaml - values-httpRoute.yaml + parameters: + - name: storageClassName + value: '{{.storageClassName}}' destination: namespace: apps name: '{{.name}}' diff --git a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml index 68241de3..69ce2cec 100644 --- a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml +++ b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml @@ -11,8 +11,7 @@ spec: elements: # Names of clusters to deploy the app to - name: prod-v4 - # Uncomment if you want to deploy to prod-fallback - #- name: prod-fallback + - name: prod-fallback template: metadata: name: rabbitmq-cluster-operator diff --git a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml index 84162646..97a0b4ef 100644 --- a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml +++ b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml @@ -11,8 +11,7 @@ spec: elements: # Names of clusters to deploy the app to - name: prod-v4 - # Uncomment if you want to deploy to prod-fallback - #- name: prod-fallback + - name: prod-fallback template: metadata: name: rabbitmq-topology-operator From f8f847c114b71896726b00f5fa4d3cf0cd81375a Mon Sep 17 00:00:00 2001 From: Bhaswati Dey Date: Thu, 3 Sep 2026 10:02:18 +0100 Subject: [PATCH 3/3] correct the metadata name --- argocd/uex/prod/shared/cert-manager/apps.yaml | 2 +- .../prod/shared/rabbitmq-operators/cluster-operator/apps.yaml | 2 +- .../prod/shared/rabbitmq-operators/topology-operator/apps.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd/uex/prod/shared/cert-manager/apps.yaml b/argocd/uex/prod/shared/cert-manager/apps.yaml index 7405bee9..915a26f2 100644 --- a/argocd/uex/prod/shared/cert-manager/apps.yaml +++ b/argocd/uex/prod/shared/cert-manager/apps.yaml @@ -14,7 +14,7 @@ spec: - name: prod-fallback template: metadata: - name: cert-manager + name: '{{.name}}-cert-manager' annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml index 69ce2cec..48943eeb 100644 --- a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml +++ b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml @@ -14,7 +14,7 @@ spec: - name: prod-fallback template: metadata: - name: rabbitmq-cluster-operator + name: '{{.name}}-rabbitmq-cluster-operator' annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml index 97a0b4ef..0d50b662 100644 --- a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml +++ b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml @@ -14,7 +14,7 @@ spec: - name: prod-fallback template: metadata: - name: rabbitmq-topology-operator + name: '{{.name}}-rabbitmq-topology-operator' annotations: argocd.argoproj.io/sync-wave: "1" spec: