move schema app to stable and nightly sources, restructure values

DiamondLightSource · Jul 3, 2024 · f358bb4 · f358bb4
1 parent 3455875
commit f358bb4
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 107 deletions.
diff --git a/charts/apps/Chart.yaml b/charts/apps/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: graph
 description: ArgoCD Apps used to deploy the Graph
 type: application
-version: 0.1.0
+version: 0.1.1
diff --git a/charts/apps/templates/monitoring.yaml b/charts/apps/templates/monitoring.yaml
@@ -8,9 +8,9 @@ metadata:
 spec:
   project: {{ default .Release.Namespace .Values.project }}
   source:
-    repoURL: {{ .Values.source.repoURL }}
-    targetRevision: {{ .Values.source.targetRevision }}
-    path: {{ .Values.source.monitoring.path }}
+    repoURL: {{ .Values.monitoring.repoURL }}
+    targetRevision: {{ .Values.monitoring.targetRevision }}
+    path: {{ .Values.monitoring.path }}
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}

diff --git a/charts/apps/templates/nightly.yaml b/charts/apps/templates/nightly.yaml
@@ -7,42 +7,45 @@ metadata:
     - resources-finalizer.argocd.argoproj.io
 spec:
   project: {{ default .Release.Namespace .Values.project }}
-  source:
-    repoURL: {{ .Values.source.repoURL }}
-    targetRevision: {{ .Values.source.targetRevision }}
-    path: {{ .Values.source.graph.path }}
-    helm:
-      valuesObject:
-        router:
+  sources:
+    - repoURL: {{ .Values.graph.repoURL }}
+      targetRevision: {{ .Values.graph.targetRevision }}
+      path: {{ .Values.graph.path }}
+      helm:
+        valuesObject:
           router:
-            configuration:
-              sandbox:
+            router:
+              configuration:
+                sandbox:
                 enabled: false
               supergraph:
-                path: /nightly
-              telemetry:
-                exporters:
-                  metrics:
-                    common:
-                      resource:
-                        "service.name": "router-nightly"
-                    otlp:
-                      enabled: true
-                      endpoint: 'graph-monitoring-opentelemetry-collector:4317'
-                      protocol: grpc
-                  tracing:
-                    common:
-                      resource:
-                        "service.name": "router-nightly"
-                    otlp:
-                      enabled: true
-                      endpoint: 'graph-monitoring-opentelemetry-collector:4317'
-                      protocol: grpc
-                    propagation:
-                      trace_context: true
-        oauth2-proxy:
-          ingress:
-            path: /nightly
+                  path: /nightly
+                telemetry:
+                  exporters:
+                    metrics:
+                      common:
+                        resource:
+                          "service.name": "router-nightly"
+                      otlp:
+                        enabled: true
+                        endpoint: 'graph-monitoring-opentelemetry-collector:4317'
+                        protocol: grpc
+                    tracing:
+                      common:
+                        resource:
+                          "service.name": "router-nightly"
+                      otlp:
+                        enabled: true
+                        endpoint: 'graph-monitoring-opentelemetry-collector:4317'
+                        protocol: grpc
+                      propagation:
+                        trace_context: true
+          oauth2-proxy:
+            ingress:
+              path: /nightly
+    - repoURL: {{ .Values.schema.repoURL }}
+      chart: {{ .Values.schema.chart }}
+      targetRevision: 0.1.1
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}

diff --git a/charts/apps/templates/schema-nightly.yaml b/charts/apps/templates/schema-nightly.yaml
diff --git a/charts/apps/templates/schema-stable.yaml b/charts/apps/templates/schema-stable.yaml
diff --git a/charts/apps/templates/stable.yaml b/charts/apps/templates/stable.yaml
@@ -7,35 +7,38 @@ metadata:
     - resources-finalizer.argocd.argoproj.io
 spec:
   project: {{ default .Release.Namespace .Values.project }}
-  source:
-    repoURL: {{ .Values.source.repoURL }}
-    targetRevision: {{ .Values.source.targetRevision }}
-    path: {{ .Values.source.graph.path }}
-    helm:
-      valuesObject:
-        router:
+  sources:
+    - repoURL: {{ .Values.graph.repoURL }}
+      targetRevision: {{ .Values.graph.targetRevision }}
+      path: {{ .Values.graph.path }}
+      helm:
+        valuesObject:
           router:
-            configuration:
-              telemetry:
-                exporters:
-                  metrics:
-                    common:
-                      resource:
-                        "service.name": "router-stable"
-                    otlp:
-                      enabled: true
-                      endpoint: 'graph-monitoring-opentelemetry-collector:4317'
-                      protocol: grpc
-                  tracing:
-                    common:
-                      resource:
-                        "service.name": "router-stable"
-                    otlp:
-                      enabled: true
-                      endpoint: 'graph-monitoring-opentelemetry-collector:4317'
-                      protocol: grpc
-                    propagation:
-                      trace_context: true
+            router:
+              configuration:
+                telemetry:
+                  exporters:
+                    metrics:
+                      common:
+                        resource:
+                          "service.name": "router-stable"
+                      otlp:
+                        enabled: true
+                        endpoint: 'graph-monitoring-opentelemetry-collector:4317'
+                        protocol: grpc
+                    tracing:
+                      common:
+                        resource:
+                          "service.name": "router-stable"
+                      otlp:
+                        enabled: true
+                        endpoint: 'graph-monitoring-opentelemetry-collector:4317'
+                        protocol: grpc
+                      propagation:
+                        trace_context: true
+    - repoURL: {{ .Values.schema.repoURL }}
+      chart: {{ .Values.schema.chart }}
+      targetRevision: {{ .Values.schema.targetRevision }}
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}

diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
@@ -1,18 +1,19 @@
 project: ""
 
-source:
+monitoring:
   repoURL: https://github.com/DiamondLightSource/graph-federation
   targetRevision: HEAD
-  monitoring:
-    path: charts/monitoring
-  graph:
-    path: charts/graph
+  path: charts/monitoring
+
+graph:
+  repoURL: https://github.com/DiamondLightSource/graph-federation
+  targetRevision: HEAD
+  path: charts/graph
 
 schema:
   repoURL: ghcr.io/diamondlightsource/graph-federation-supergraph
+  targetRevision: 0.1.1
   chart: supergraph
-  stableVersion: 0.1.1
-  nightlyVersion: 0.1.1
 
 destination:
   name: ""

diff --git a/charts/graph/Chart.yaml b/charts/graph/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: graph
 description: The Diamond data Graph
 type: application
-version: 0.9.0
+version: 0.9.1
 dependencies:
   - name: router
     repository: oci://ghcr.io/apollographql/helm-charts