From 712a155e3e31a9739d2bd2fce4fad6f270e7e3a6 Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Wed, 13 Nov 2024 17:28:46 +0000
Subject: [PATCH] DNM: for testing #171 locally

---
 charts/argocd-apps/templates/redis.yaml         | 2 +-
 charts/argocd-config/templates/app-of-apps.yaml | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 6466cbe..0dedb6b 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -18,7 +18,7 @@ spec:
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml
     - repoURL: {{ .Values.repoUrls.deploy }}
-      targetRevision: HEAD
+      targetRevision:  de/argo-redis2 # use the unmerged branch on the deploy repository
       ref: deployRepo
 
   syncPolicy:
diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index fa28df6..76244e5 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -9,15 +9,18 @@ spec:
   project: {{ .Values.environment }}
   sources:
     - repoURL: https://github.com/wbstack/charts.git
-      targetRevision: 1.0.6
-      chart: argocd-apps
+      targetRevision: "de/argo-apps-redis-demo-dnm" # use this branch to
+      # get the new unreleased app-of-apps chart including the alteration
+      # to use the unmerged branch on the deploy repo for values in
+      # redis.yaml
+      path: "charts/argocd-apps"
       helm:
         values: |
 {{ toYaml .Values | indent 10 }}
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/app-of-apps.values.yaml
     - repoURL: {{ .Values.repoUrls.deploy }}
-      targetRevision: HEAD
+      targetRevision:  de/argo-redis2 # use the unmerged branch on the deploy repository
       ref: deployRepo
   syncPolicy:
     automated: