From 9989135857c72c6d1749e546b0449d3708143b7a Mon Sep 17 00:00:00 2001
From: Garry O'Donnell <garry.o'donnell@diamond.ac.uk>
Date: Tue, 17 Sep 2024 12:07:34 +0100
Subject: [PATCH] Allow independent configuration of stable & nightly revisions

---
 charts/apps/templates/nightly.yaml | 4 ++--
 charts/apps/templates/stable.yaml  | 4 ++--
 charts/apps/values.yaml            | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/apps/templates/nightly.yaml b/charts/apps/templates/nightly.yaml
index 8648765..f56dbdb 100644
--- a/charts/apps/templates/nightly.yaml
+++ b/charts/apps/templates/nightly.yaml
@@ -9,7 +9,7 @@ spec:
   project: {{ default .Release.Namespace .Values.project }}
   sources:
     - repoURL: {{ .Values.graph.repoURL }}
-      targetRevision: HEAD
+      targetRevision: {{ .Values.graph.nightlyRevision }}
       path: {{ .Values.graph.path }}
       helm:
         valuesObject:
@@ -47,7 +47,7 @@ spec:
               path: /nightly
     - repoURL: {{ .Values.schema.repoURL }}
       chart: {{ .Values.schema.chart }}
-      targetRevision: "*"
+      targetRevision: {{ .Values.schema.nightlyRevision | quote }}
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}
diff --git a/charts/apps/templates/stable.yaml b/charts/apps/templates/stable.yaml
index ceaf2b0..bc20364 100644
--- a/charts/apps/templates/stable.yaml
+++ b/charts/apps/templates/stable.yaml
@@ -9,7 +9,7 @@ spec:
   project: {{ default .Release.Namespace .Values.project }}
   sources:
     - repoURL: {{ .Values.graph.repoURL }}
-      targetRevision: {{ .Values.graph.targetRevision }}
+      targetRevision: {{ .Values.graph.stableRevision }}
       path: {{ .Values.graph.path }}
       helm:
         valuesObject:
@@ -38,7 +38,7 @@ spec:
                         trace_context: true
     - repoURL: {{ .Values.schema.repoURL }}
       chart: {{ .Values.schema.chart }}
-      targetRevision: {{ .Values.schema.targetRevision }}
+      targetRevision: {{ .Values.schema.stableRevision | quote }}
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}
diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
index 44ddbc4..9066415 100644
--- a/charts/apps/values.yaml
+++ b/charts/apps/values.yaml
@@ -7,12 +7,14 @@ monitoring:
 
 graph:
   repoURL: https://github.com/DiamondLightSource/graph-federation
-  targetRevision: HEAD
+  nightlyRevision: HEAD
+  stableRevision: HEAD
   path: charts/graph
 
 schema:
   repoURL: ghcr.io/diamondlightsource/graph-federation-supergraph
-  targetRevision: 0.1.2
+  nightlyRevision: "*"
+  stableRevision: 0.1.2
   chart: supergraph
 
 destination: