From 43456f5a9017c18c4209e106f7f1214ad8a8ef8e Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 17:35:58 +0200
Subject: [PATCH 01/20] add redis Application manifest and bitnami source

---
 charts/argocd-apps/templates/redis.yaml | 27 +++++++++++++++++++++++++
 charts/argocd-apps/values.yaml          |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 charts/argocd-apps/templates/redis.yaml

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
new file mode 100644
index 0000000..a63ef12
--- /dev/null
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -0,0 +1,27 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: redis
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: default
+    server: {{ .Values.clusterUrl }}
+  project: {{ .Values.environment }}
+  sources:
+    - repoURL: {{ .Values.repoUrls.bitnami }}
+      targetRevision: 17.3.8
+      chart: bitnami/redis
+      helm:
+        valueFiles:
+          - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml
+    - repoURL: {{ .Values.repoUrls.deploy }}
+      targetRevision: HEAD
+      ref: deployRepo
+
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: false
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index c75f03a..bbeb535 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -2,6 +2,7 @@ repoUrls:
   deploy: https://github.com/wmde/wbaas-deploy
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
+  bitnami: https://charts.bitnami.com/bitnami
 clusterUrl: https://kubernetes.default.svc
 environment: production
 

From d3be5a4b2d0a1bfa33c21e6fba12ce537ce7c0ac Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 18:13:22 +0200
Subject: [PATCH 02/20] use temp deploy branch

---
 charts/argocd-apps/templates/redis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index a63ef12..02b8d28 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
       ref: deployRepo
 
   syncPolicy:

From 4ca79806269aab06882fc423ef3bf8f641d39008 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 18:26:52 +0200
Subject: [PATCH 03/20] update chart name

---
 charts/argocd-apps/templates/redis.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 02b8d28..5da9d92 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -13,7 +13,7 @@ spec:
   sources:
     - repoURL: {{ .Values.repoUrls.bitnami }}
       targetRevision: 17.3.8
-      chart: bitnami/redis
+      chart: redis
       helm:
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml

From 6f9cfe82d006ca02cfb8fdc234c45ee59a33ee9b Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 19:05:51 +0200
Subject: [PATCH 04/20] redis git test

---
 charts/argocd-apps/templates/redis.yaml | 4 ++--
 charts/argocd-apps/values.yaml          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 5da9d92..c94de9e 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -11,9 +11,9 @@ spec:
     server: {{ .Values.clusterUrl }}
   project: {{ .Values.environment }}
   sources:
-    - repoURL: {{ .Values.repoUrls.bitnami }}
+    - repoURL: {{ .Values.repoUrls.bitnami-git }}
       targetRevision: 17.3.8
-      chart: redis
+      path: bitnami/redis
       helm:
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index bbeb535..e71e7be 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -3,6 +3,7 @@ repoUrls:
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
   bitnami: https://charts.bitnami.com/bitnami
+  btinami-git: https://github.com/bitnami.git
 clusterUrl: https://kubernetes.default.svc
 environment: production
 

From 60f03264fbfe5a96c67851afc0de2a4aab740796 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 19:18:44 +0200
Subject: [PATCH 05/20] fix yaml

---
 charts/argocd-apps/templates/redis.yaml | 2 +-
 charts/argocd-apps/values.yaml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index c94de9e..08d229c 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -11,7 +11,7 @@ spec:
     server: {{ .Values.clusterUrl }}
   project: {{ .Values.environment }}
   sources:
-    - repoURL: {{ .Values.repoUrls.bitnami-git }}
+    - repoURL: {{ .Values.repoUrls.bitnamiGit }}
       targetRevision: 17.3.8
       path: bitnami/redis
       helm:
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index e71e7be..5682219 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -3,7 +3,7 @@ repoUrls:
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
   bitnami: https://charts.bitnami.com/bitnami
-  btinami-git: https://github.com/bitnami.git
+  btinamiGit: https://github.com/bitnami.git
 clusterUrl: https://kubernetes.default.svc
 environment: production
 

From b95a53035d1e05750be2a03f254948c69049ff4f Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 19:21:16 +0200
Subject: [PATCH 06/20] update repo url

---
 charts/argocd-apps/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index 5682219..343d54a 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -3,7 +3,7 @@ repoUrls:
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
   bitnami: https://charts.bitnami.com/bitnami
-  btinamiGit: https://github.com/bitnami.git
+  btinamiGit: https://github.com/bitnami/charts.git
 clusterUrl: https://kubernetes.default.svc
 environment: production
 

From 15caaac2230884a69ba93995288fb0c6aa22a6bc Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 16 Oct 2024 19:26:51 +0200
Subject: [PATCH 07/20] use HEAD

---
 charts/argocd-apps/templates/redis.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 08d229c..635ae77 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -12,7 +12,8 @@ spec:
   project: {{ .Values.environment }}
   sources:
     - repoURL: {{ .Values.repoUrls.bitnamiGit }}
-      targetRevision: 17.3.8
+      # targetRevision: 17.3.8
+      targetRevision: HEAD
       path: bitnami/redis
       helm:
         valueFiles:

From 8800f91366b3ba1753d3a8c61c37f858956c25ba Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 13:33:30 +0200
Subject: [PATCH 08/20] update

---
 charts/argocd-apps/templates/redis.yaml     | 7 +++----
 charts/argocd-apps/templates/wbaas-api.yaml | 2 +-
 charts/argocd-apps/values.yaml              | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 635ae77..5da9d92 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -11,10 +11,9 @@ spec:
     server: {{ .Values.clusterUrl }}
   project: {{ .Values.environment }}
   sources:
-    - repoURL: {{ .Values.repoUrls.bitnamiGit }}
-      # targetRevision: 17.3.8
-      targetRevision: HEAD
-      path: bitnami/redis
+    - repoURL: {{ .Values.repoUrls.bitnami }}
+      targetRevision: 17.3.8
+      chart: redis
       helm:
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/redis.values.yaml
diff --git a/charts/argocd-apps/templates/wbaas-api.yaml b/charts/argocd-apps/templates/wbaas-api.yaml
index d67db37..a328f05 100644
--- a/charts/argocd-apps/templates/wbaas-api.yaml
+++ b/charts/argocd-apps/templates/wbaas-api.yaml
@@ -12,7 +12,7 @@ spec:
   project: {{ .Values.environment }}
   sources:
     - repoURL: {{ .Values.repoUrls.wbstack }}
-      targetRevision: 0.31.2
+      targetRevision: 0.32.0
       chart: api
       helm:
         valueFiles:
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index 343d54a..bbeb535 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -3,7 +3,6 @@ repoUrls:
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
   bitnami: https://charts.bitnami.com/bitnami
-  btinamiGit: https://github.com/bitnami/charts.git
 clusterUrl: https://kubernetes.default.svc
 environment: production
 

From 71c218c9aeb91ee1f2534a0d878b3ade9fcd3acc Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 18:22:18 +0200
Subject: [PATCH 09/20] add bitnami chart repo

---
 charts/argocd-config/templates/projects.yaml | 3 ++-
 charts/argocd-config/values.yaml             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/argocd-config/templates/projects.yaml b/charts/argocd-config/templates/projects.yaml
index e2461a5..6cce2ea 100644
--- a/charts/argocd-config/templates/projects.yaml
+++ b/charts/argocd-config/templates/projects.yaml
@@ -14,4 +14,5 @@ spec:
   sourceRepos:
   - {{ .Values.repoUrls.deploy }}
   - {{ .Values.repoUrls.charts }}
-  - {{ .Values.repoUrls.wbstack }}
\ No newline at end of file
+  - {{ .Values.repoUrls.wbstack }}
+  - {{ .Values.repoUrls.bitnami }}
\ No newline at end of file
diff --git a/charts/argocd-config/values.yaml b/charts/argocd-config/values.yaml
index c2f4a4d..a0cbe3b 100644
--- a/charts/argocd-config/values.yaml
+++ b/charts/argocd-config/values.yaml
@@ -4,3 +4,4 @@ repoUrls:
   deploy: https://github.com/wmde/wbaas-deploy
   charts: https://github.com/wbstack/charts.git
   wbstack: https://wbstack.github.io/charts
+  bitnami: https://charts.bitnami.com/bitnami

From 5b45c2aa886b43a9478df4eb64fa3ace37b01b71 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 18:22:49 +0200
Subject: [PATCH 10/20] bump chart version

---
 charts/argocd-config/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml
index de290f5..35b5450 100644
--- a/charts/argocd-config/Chart.yaml
+++ b/charts/argocd-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-config
 description: Chart to deploy ArgoCD configuration (including the argocd-apps chart)
 type: application
-version: 1.0.5
+version: 1.0.6
 appVersion: "1.0"
 maintainers:
   - name: WBstack

From 4c2119d50d57b232867343b3cd669f70adb66ad2 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 18:26:49 +0200
Subject: [PATCH 11/20] bump app-of-apps chart version

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

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index b188af5..d06c98d 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD
 type: application
-version: 1.0.3
+version: 1.0.4
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index b967c8d..36293bf 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -9,7 +9,7 @@ spec:
   project: {{ .Values.environment }}
   source:
     repoURL: {{ .Values.repoUrls.wbstack }}
-    targetRevision: 1.0.3
+    targetRevision: 1.0.4
     chart: argocd-apps
     helm:
       values: |

From 4376f1ec6f37c519486874154008b8d951d03bb8 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 18:29:17 +0200
Subject: [PATCH 12/20] bump again

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

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index d06c98d..0c57b1a 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD
 type: application
-version: 1.0.4
+version: 1.0.5
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index 36293bf..c241e56 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -9,7 +9,7 @@ spec:
   project: {{ .Values.environment }}
   source:
     repoURL: {{ .Values.repoUrls.wbstack }}
-    targetRevision: 1.0.4
+    targetRevision: 1.0.5
     chart: argocd-apps
     helm:
       values: |

From b13e24355567defef76f0b16e3576fdcdffbe20d Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Thu, 17 Oct 2024 18:31:29 +0200
Subject: [PATCH 13/20] remove new api version

---
 charts/argocd-apps/templates/wbaas-api.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-apps/templates/wbaas-api.yaml b/charts/argocd-apps/templates/wbaas-api.yaml
index a328f05..d67db37 100644
--- a/charts/argocd-apps/templates/wbaas-api.yaml
+++ b/charts/argocd-apps/templates/wbaas-api.yaml
@@ -12,7 +12,7 @@ spec:
   project: {{ .Values.environment }}
   sources:
     - repoURL: {{ .Values.repoUrls.wbstack }}
-      targetRevision: 0.32.0
+      targetRevision: 0.31.2
       chart: api
       helm:
         valueFiles:

From 2de627a1ab0d2f5800154e7feb794fc6dc425d5c Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 18 Oct 2024 14:30:46 +0200
Subject: [PATCH 14/20] bump chart version

---
 charts/argocd-config/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml
index 35b5450..8a8c12b 100644
--- a/charts/argocd-config/Chart.yaml
+++ b/charts/argocd-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-config
 description: Chart to deploy ArgoCD configuration (including the argocd-apps chart)
 type: application
-version: 1.0.6
+version: 1.0.7
 appVersion: "1.0"
 maintainers:
   - name: WBstack

From 94daf24e1beb16b291831576366a9bf8e623bb3a Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Wed, 6 Nov 2024 09:47:54 +0000
Subject: [PATCH 15/20] Increase chart versions to pass linting

This commit also introduces using a variable in the
app-of-apps chart to specify versions of the individual
helm charts we wish to apply.

This should prevent requiring a new helmfile apply
needing to be run to bump versions of charts.

It should also prevent us needed to release a new
argocd-config chart when we want to bump a released chart version
---
 charts/argocd-apps/Chart.yaml                   | 2 +-
 charts/argocd-apps/templates/redis.yaml         | 2 +-
 charts/argocd-apps/values.yaml                  | 2 ++
 charts/argocd-config/Chart.yaml                 | 2 +-
 charts/argocd-config/templates/app-of-apps.yaml | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index 0c57b1a..9616dca 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD
 type: application
-version: 1.0.5
+version: 1.0.6
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 5da9d92..30e42ae 100644
--- a/charts/argocd-apps/templates/redis.yaml
+++ b/charts/argocd-apps/templates/redis.yaml
@@ -12,7 +12,7 @@ spec:
   project: {{ .Values.environment }}
   sources:
     - repoURL: {{ .Values.repoUrls.bitnami }}
-      targetRevision: 17.3.8
+      targetRevision: {{ .Values.chartVersions.redis }}
       chart: redis
       helm:
         valueFiles:
diff --git a/charts/argocd-apps/values.yaml b/charts/argocd-apps/values.yaml
index bbeb535..803e16e 100644
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@@ -6,4 +6,6 @@ repoUrls:
 clusterUrl: https://kubernetes.default.svc
 environment: production
 
+chartVersions:
+  redis: 17.3.8
 # "inherits" values from argocd-config chart
diff --git a/charts/argocd-config/Chart.yaml b/charts/argocd-config/Chart.yaml
index 8a8c12b..e37fda2 100644
--- a/charts/argocd-config/Chart.yaml
+++ b/charts/argocd-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-config
 description: Chart to deploy ArgoCD configuration (including the argocd-apps chart)
 type: application
-version: 1.0.7
+version: 1.0.8
 appVersion: "1.0"
 maintainers:
   - name: WBstack
diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index c241e56..ab8df7e 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -9,7 +9,7 @@ spec:
   project: {{ .Values.environment }}
   source:
     repoURL: {{ .Values.repoUrls.wbstack }}
-    targetRevision: 1.0.5
+    targetRevision: 1.0.6
     chart: argocd-apps
     helm:
       values: |

From 94a7325d3d57b4088571b5c1e06227fb5e5c56fa Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Mon, 11 Nov 2024 19:18:53 +0000
Subject: [PATCH 16/20] inject chart versions into app-of-apps

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

diff --git a/charts/argocd-apps/templates/redis.yaml b/charts/argocd-apps/templates/redis.yaml
index 30e42ae..6466cbe 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: de/argo-redis2
+      targetRevision: HEAD
       ref: deployRepo
 
   syncPolicy:
diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index ab8df7e..90e9663 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -7,13 +7,18 @@ spec:
     server: https://kubernetes.default.svc
     namespace: argocd
   project: {{ .Values.environment }}
-  source:
-    repoURL: {{ .Values.repoUrls.wbstack }}
+  sources:
+    - repoURL: {{ .Values.repoUrls.wbstack }}
     targetRevision: 1.0.6
     chart: argocd-apps
     helm:
       values: |
 {{ toYaml .Values | indent 8 }}
+      valueFiles:
+          - $deployRepo/k8s/argocd/{{ .Values.environment }}/app-of-apps.values.yaml
+    - repoURL: {{ .Values.repoUrls.deploy }}
+      targetRevision: HEAD
+      ref: deployRepo
   syncPolicy:
     automated:
       prune: false

From 500e4ca790fcaef8ee2f866f5b7fd07878018b0f Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Tue, 12 Nov 2024 16:00:16 +0000
Subject: [PATCH 17/20] ensure using HEAD deploy

---
 charts/argocd-config/templates/app-of-apps.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index 90e9663..fa28df6 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -8,13 +8,13 @@ spec:
     namespace: argocd
   project: {{ .Values.environment }}
   sources:
-    - repoURL: {{ .Values.repoUrls.wbstack }}
-    targetRevision: 1.0.6
-    chart: argocd-apps
-    helm:
-      values: |
-{{ toYaml .Values | indent 8 }}
-      valueFiles:
+    - repoURL: https://github.com/wbstack/charts.git
+      targetRevision: 1.0.6
+      chart: 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

From 013ebbc628979847e51edc0f8bdb5be1b4c4d133 Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Tue, 12 Nov 2024 21:29:08 +0000
Subject: [PATCH 18/20] tweak indenting

---
 charts/argocd-config/templates/app-of-apps.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index fa28df6..30141fb 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -13,7 +13,7 @@ spec:
       chart: argocd-apps
       helm:
         values: |
-{{ toYaml .Values | indent 10 }}
+          {{ toYaml .Values | indent 10 }}
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/app-of-apps.values.yaml
     - repoURL: {{ .Values.repoUrls.deploy }}

From ef54648d8e86f97652dbd23ac59404c58674b181 Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomas.arrow@wikimedia.de>
Date: Tue, 12 Nov 2024 21:54:32 +0000
Subject: [PATCH 19/20] tweak indenting back

---
 charts/argocd-config/templates/app-of-apps.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argocd-config/templates/app-of-apps.yaml b/charts/argocd-config/templates/app-of-apps.yaml
index 30141fb..fa28df6 100644
--- a/charts/argocd-config/templates/app-of-apps.yaml
+++ b/charts/argocd-config/templates/app-of-apps.yaml
@@ -13,7 +13,7 @@ spec:
       chart: argocd-apps
       helm:
         values: |
-          {{ toYaml .Values | indent 10 }}
+{{ toYaml .Values | indent 10 }}
         valueFiles:
           - $deployRepo/k8s/argocd/{{ .Values.environment }}/app-of-apps.values.yaml
     - repoURL: {{ .Values.repoUrls.deploy }}

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 20/20] 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: