From 50abfd736b3848f4ebf90da22ccda0fe5bd6b668 Mon Sep 17 00:00:00 2001 From: James Gilbert Date: Mon, 14 Sep 2026 13:35:34 +0100 Subject: [PATCH 1/3] feat(events): remove i15-1 example ctt --- charts/events/Chart.yaml | 2 +- .../templates/example-trigger-templates.yaml | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/charts/events/Chart.yaml b/charts/events/Chart.yaml index c7d4173b8..db4102c9e 100644 --- a/charts/events/Chart.yaml +++ b/charts/events/Chart.yaml @@ -3,7 +3,7 @@ name: events description: Data Analysis event triggering type: application -version: 0.3.11 +version: 0.3.12 dependencies: - name: argo-events diff --git a/charts/events/templates/example-trigger-templates.yaml b/charts/events/templates/example-trigger-templates.yaml index 5058b6bd9..00e4b3c54 100644 --- a/charts/events/templates/example-trigger-templates.yaml +++ b/charts/events/templates/example-trigger-templates.yaml @@ -20,23 +20,6 @@ spec: --- apiVersion: workflows.diamond.ac.uk/v1alpha1 kind: ClusterTriggerTemplate -metadata: - name: i15-1-trigger - labels: - workflows.diamond.ac.uk/source: message-bus - workflows.diamond.ac.uk/beamline: i15-1 -spec: - eventName: i15-1-message - workflow: - template: access-visit-dir - triggerOnMessageType: stop - parameters: - - name: visitdir - path: doc.data_session_directory - ---- -apiVersion: workflows.diamond.ac.uk/v1alpha1 -kind: ClusterTriggerTemplate metadata: name: visr-trigger labels: From acae7f3dbfe3a6443d71168cd174f9dd0edeefbb Mon Sep 17 00:00:00 2001 From: James Gilbert Date: Mon, 14 Sep 2026 11:57:16 +0100 Subject: [PATCH 2/3] feat(charts): make Argo CD ingest ClusterTriggerTemplates from tenant repos --- charts/groups/templates/projects.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/groups/templates/projects.yaml b/charts/groups/templates/projects.yaml index a0ad39856..da0501a67 100644 --- a/charts/groups/templates/projects.yaml +++ b/charts/groups/templates/projects.yaml @@ -20,6 +20,8 @@ spec: clusterResourceWhitelist: - group: argoproj.io kind: ClusterWorkflowTemplate + - group: workflows.diamond.ac.uk + kind: ClusterTriggerTemplate namespaceResourceWhitelist: - group: argoproj.io kind: WorkflowTemplate From a7ade28dc45067c26d8a606cb6fab65ebb92f52a Mon Sep 17 00:00:00 2001 From: James Gilbert Date: Mon, 14 Sep 2026 13:27:25 +0100 Subject: [PATCH 3/3] feat(groups): add separate app for i15-1 CTTs --- charts/groups/Chart.yaml | 2 +- charts/groups/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/groups/Chart.yaml b/charts/groups/Chart.yaml index a17ec0af5..1bd1444ba 100644 --- a/charts/groups/Chart.yaml +++ b/charts/groups/Chart.yaml @@ -3,4 +3,4 @@ name: group-projects description: A collection of AppProjects and Apps for science domain groups type: application -version: 0.3.18 +version: 0.3.19 diff --git a/charts/groups/values.yaml b/charts/groups/values.yaml index d724fb851..537d92c15 100644 --- a/charts/groups/values.yaml +++ b/charts/groups/values.yaml @@ -59,6 +59,9 @@ groups: repoURL: https://github.com/DiamondLightSource/crystallography-workflows path: I15-1_workflows sourceType: helm + - name: i15-1-triggers + repoURL: https://github.com/DiamondLightSource/crystallography-workflows + path: I15-1_workflows/triggertemplates - name: test-rig enabled: true permittedRepos: []