From 1db597a291766e03715a524cdd271c3e7e51dd07 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 1 Nov 2023 22:49:35 +0100
Subject: [PATCH] Fix value inheritance

---
 argocd/app-of-apps/test/values.yaml       |  4 +--
 argocd/prometheus/test/argocd_values.yaml | 44 ++++++++++++-----------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml
index 6954b4d..fdad8d8 100644
--- a/argocd/app-of-apps/test/values.yaml
+++ b/argocd/app-of-apps/test/values.yaml
@@ -31,10 +31,10 @@ applications:
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
   - name: prometheus
     project: default
-    targetRevision: 25.4.x
+    targetRevision: main
     namespace: observability
     createNamespace: true
-    repoURL: https://prometheus-community.github.io/helm-charts
+    repoURL: https://git.2martens.de/2martens/cloud-configuration.git
 
 
 overall:
diff --git a/argocd/prometheus/test/argocd_values.yaml b/argocd/prometheus/test/argocd_values.yaml
index a10beea..003423f 100644
--- a/argocd/prometheus/test/argocd_values.yaml
+++ b/argocd/prometheus/test/argocd_values.yaml
@@ -1,26 +1,28 @@
-prometheus-node-exporter:
-  hostRootFsMount:
-    mountPropagation: None
+prometheus:
+  prometheus-node-exporter:
+    hostRootFsMount:
+      mountPropagation: None
 
-ingress:
-  enabled: true
-  ingressClassName: public
-  hosts:
-    - prometheus.k8s.test.2martens.de
-  annotations:
-    cert-manager.io/cluster-issuer: lets-encrypt
-  tls:
-    - secretName: prometheus-server-tls
+  server:
+    ingress:
+      enabled: true
+      ingressClassName: public
       hosts:
         - prometheus.k8s.test.2martens.de
+      annotations:
+        cert-manager.io/cluster-issuer: lets-encrypt
+      tls:
+        - secretName: prometheus-server-tls
+          hosts:
+            - prometheus.k8s.test.2martens.de
 
-alertmanager:
-  enabled: false
+  alertmanager:
+    enabled: false
 
-resources: { }
-# requests:
-#   cpu: 100m
-#   memory: 128Mi
-# limits:
-#   cpu: 100m
-#   memory: 128Mi
+  resources: { }
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi